diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists.json
new file mode 100644
index 00000000..c71908ea
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 286,
+      "width": 36,
+      "height": 18,
+      "ypos": 377,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_blivet_part_root_exists"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists.png
new file mode 100644
index 00000000..9fdb0dfb
Binary files /dev/null and b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists.png differ
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists_alt.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists_alt.json
index 5bd004f5..47993513 100644
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists_alt.json
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_root_exists_alt.json
@@ -1,15 +1,15 @@
-{
-    "area": [
-        {
-            "height": 18,
-            "type": "match",
-            "width": 51,
-            "xpos": 245,
-            "ypos": 353
-        }
-    ],
-    "properties": [],
-    "tags": [
-        "anaconda_blivet_part_root_exists"
-    ]
+{
+  "area": [
+    {
+      "xpos": 265,
+      "width": 36,
+      "height": 18,
+      "ypos": 353,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_blivet_part_root_exists"
+  ]
 }
\ No newline at end of file
diff --git a/tests/disk_custom_blivet_btrfs_preserve_home.pm b/tests/disk_custom_blivet_btrfs_preserve_home.pm
index d4aa284b..734c729e 100644
--- a/tests/disk_custom_blivet_btrfs_preserve_home.pm
+++ b/tests/disk_custom_blivet_btrfs_preserve_home.pm
@@ -76,12 +76,15 @@ sub run {
     # taking any effect.
     sleep 5;
 
-    # delete root subvolume. first click may not work
-    assert_and_click "anaconda_blivet_part_root_exists";
-    wait_still_screen 2;
-    click_lastmatch if (check_screen "anaconda_blivet_part_root_exists");
-    assert_and_click "anaconda_blivet_part_delete";
-    assert_and_click "anaconda_blivet_btn_ok";
+    # While there are some root subvolumes (it seems that there can be more than one)
+    # continue to delete them.
+    while (check_screen "anaconda_blivet_part_root_exists", 2) {
+        assert_and_click "anaconda_blivet_part_root_exists";
+        wait_still_screen 2;
+        assert_and_click "anaconda_blivet_part_delete";
+        assert_and_click "anaconda_blivet_btn_ok";
+        sleep 5;
+    }
 
     # Add new root partition
     assert_and_click "anaconda_add";