diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index 41f6ea8a..8325afaa 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -40,15 +40,26 @@ sub select_disks {
         }
     }
     else {
-        # Single disk case.
+        # Single disk cases.
         if ($args{disks} == 0) {
-            # Clicking will *de*-select.
-            assert_and_click "anaconda_install_destination_select_disk_1";
+            # Clicking will *de*-select...unless we're running into
+            # FIXME #1805553, in which case we should do nothing
+            if (check_screen "anaconda_install_destination_disk_selected") {
+                assert_and_click "anaconda_install_destination_select_disk_1";
+            }
+            else {
+                record_soft_failure "Single disk not selected as install target - #1805553";
+            }
         }
         elsif ($args{disks} > 1) {
             die "Only one disk is connected! Cannot select $args{disks} disks.";
         }
-        # For exactly 1 disk, we don't need to do anything.
+        # For exactly 1 disk, we don't need to do anything, unless
+        # we run into FIXME #1805553...
+        unless (check_screen "anaconda_install_destination_disk_selected") {
+            record_soft_failure "Single disk not selected as install target - #1805553";
+            assert_and_click "anaconda_install_destination_select_disk_1";
+        }
     }
 
     # Handle network disks.
diff --git a/needles/anaconda/install_destination/disk_selected-20200220.json b/needles/anaconda/install_destination/disk_selected-20200220.json
new file mode 100644
index 00000000..1f8b44c4
--- /dev/null
+++ b/needles/anaconda/install_destination/disk_selected-20200220.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 89,
+      "ypos": 242,
+      "width": 25,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_install_destination_disk_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_destination/disk_selected-20200220.png b/needles/anaconda/install_destination/disk_selected-20200220.png
new file mode 100644
index 00000000..2520cfc5
Binary files /dev/null and b/needles/anaconda/install_destination/disk_selected-20200220.png differ