diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py
index 1847f30de8..dbd888c1bc 100644
--- a/archinstall/lib/interactions/disk_conf.py
+++ b/archinstall/lib/interactions/disk_conf.py
@@ -49,7 +49,8 @@ def _preview_device_selection(item: MenuItem) -> str | None:
 		multi=True,
 		preview_style=PreviewStyle.BOTTOM,
 		preview_size='auto',
-		preview_frame=FrameProperties.max('Partitions')
+		preview_frame=FrameProperties.max('Partitions'),
+		allow_skip=True
 	).run()
 
 	match result.type_:
@@ -143,8 +144,10 @@ def select_disk_config(
 				output = 'You will use whatever drive-setup is mounted at the specified directory\n'
 				output += "WARNING: Archinstall won't check the suitability of this setup\n"
 
-				path = prompt_dir(str(_('Root mount directory')), output, allow_skip=False)
-				assert path is not None
+				path = prompt_dir(str(_('Root mount directory')), output, allow_skip=True)
+
+				if path is None:
+					return None
 
 				mods = disk.device_handler.detect_pre_mounted_mods(path)