diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index f843f22..6487f2e 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1920,6 +1920,8 @@ def resetCustomStorageData(ksdata):
     cmds = ["partition", "raid", "volgroup", "logvol", "btrfs"]
     map(lambda c: ksdata.resetCommand(c), cmds)
 
+    ksdata.clearpart.type = CLEARPART_TYPE_NONE
+
 def doKickstartStorage(storage, ksdata, instClass):
     """ Setup storage state from the kickstart data """
     ksdata.clearpart.execute(storage, ksdata, instClass)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index e0240ac..5abdbda 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -168,8 +168,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     def apply(self):
         self.clear_errors()
 
-        self._unhide_unusable_disks()
-
         new_swaps = (dev for dev in self.get_new_devices() if dev.format.type == "swap")
         self.storage.setFstabSwaps(new_swaps)
 
@@ -343,23 +341,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._summaryLabel.set_text(summary)
         self._summaryLabel.set_use_underline(True)
 
-    @ui_storage_logged
-    def _hide_unusable_disks(self):
-        self._hidden_disks = []
-
-        for disk in self._storage_playground.disks:
-            if disk.protected or not disk.mediaPresent:
-                # hide removable disks containing install media
-                self._hidden_disks.append(disk)
-                self._storage_playground.devicetree.hide(disk)
-
-    def _unhide_unusable_disks(self):
-        for disk in reversed(self._hidden_disks):
-            self._storage_playground.devicetree.unhide(disk)
-
     def _reset_storage(self):
         self._storage_playground = self.storage.copy()
-        self._hide_unusable_disks()
         self._devices = self._storage_playground.devices
 
     def refresh(self):
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index c1da734..dc31700 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -491,6 +491,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             name = overview.get_property("name")
             overview.set_chosen(name in self.selected_disks)
 
+        self._customPart.set_active(not self.autopart)
+
         self._update_summary()
 
         if self.errors: