2 files changed, 10 insertions, 2 deletions
diff --git a/archinstall/lib/menu/menu.py b/archinstall/lib/menu/menu.py
index 48ea4635..b2f4146d 100644
--- a/archinstall/lib/menu/menu.py
+++ b/archinstall/lib/menu/menu.py
@@ -160,6 +160,7 @@ class Menu(TerminalMenu):
 			preview_command=preview_command,
 			preview_size=preview_size,
 			preview_title=preview_title,
+			multi_select_select_on_accept=False,
 			**kwargs,
 		)
 
diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py
index c29373f9..8311344d 100644
--- a/archinstall/lib/menu/selection_menu.py
+++ b/archinstall/lib/menu/selection_menu.py
@@ -309,8 +309,15 @@ class GeneralMenu:
 
 			if selection and self.auto_cursor:
 				cursor_pos = menu_options.index(selection) + 1  # before the strip otherwise fails
-				if cursor_pos >= len(menu_options):
-					cursor_pos = len(menu_options) - 1
+
+				# in case the new position lands on a "placeholder" we'll skip them as well
+				while True:
+					if cursor_pos >= len(menu_options):
+						cursor_pos = 0
+					if len(menu_options[cursor_pos]) > 0:
+						break
+					cursor_pos += 1
+
 				selection = selection.strip()
 			if selection:
 				# if this calls returns false, we exit the menu. We allow for an callback for special processing on realeasing control