diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py
index 87cf13a1f2..96f2ba703d 100644
--- a/archinstall/lib/global_menu.py
+++ b/archinstall/lib/global_menu.py
@@ -131,7 +131,7 @@ def _get_menu_options(self) -> list[MenuItem]:
 				action=self._select_applications,
 				value=[],
 				preview_action=self._prev_applications,
-				key='application_config',
+				key='app_config',
 			),
 			MenuItem(
 				text=tr('Kernels'),
diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py
index 3a75624cbe..58e839fbf2 100644
--- a/archinstall/lib/interactions/disk_conf.py
+++ b/archinstall/lib/interactions/disk_conf.py
@@ -92,6 +92,7 @@ def get_default_partition_layout(
 		device_modification = suggest_single_disk_layout(
 			devices[0],
 			filesystem_type=filesystem_type,
+			prompt_btrfs_structure=False,
 		)
 		return [device_modification]
 	else:
@@ -327,6 +328,7 @@ def suggest_single_disk_layout(
 	device: BDevice,
 	filesystem_type: FilesystemType | None = None,
 	separate_home: bool | None = None,
+	prompt_btrfs_structure: bool = True,
 ) -> DeviceModification:
 	if not filesystem_type:
 		filesystem_type = select_main_filesystem_format()
@@ -337,19 +339,23 @@ def suggest_single_disk_layout(
 	min_size_to_allow_home_part = Size(64, Unit.GiB, sector_size)
 
 	if filesystem_type == FilesystemType.Btrfs:
-		prompt = tr('Would you like to use BTRFS subvolumes with a default structure?') + '\n'
-		group = MenuItemGroup.yes_no()
-		group.set_focus_by_value(MenuItem.yes().value)
-		result = SelectMenu[bool](
-			group,
-			header=prompt,
-			alignment=Alignment.CENTER,
-			columns=2,
-			orientation=Orientation.HORIZONTAL,
-			allow_skip=False,
-		).run()
+		if prompt_btrfs_structure:
+			prompt = tr('Would you like to use BTRFS subvolumes with a default structure?') + '\n'
+			group = MenuItemGroup.yes_no()
+			group.set_focus_by_value(MenuItem.yes().value)
+			result = SelectMenu[bool](
+				group,
+				header=prompt,
+				alignment=Alignment.CENTER,
+				columns=2,
+				orientation=Orientation.HORIZONTAL,
+				allow_skip=False,
+			).run()
+
+			using_subvolumes = result.item() == MenuItem.yes()
+		else:
+			using_subvolumes = True
 
-		using_subvolumes = result.item() == MenuItem.yes()
 		mount_options = select_mount_options()
 	else:
 		using_subvolumes = False