diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py
index c68b717e..050e915b 100644
--- a/archinstall/lib/global_menu.py
+++ b/archinstall/lib/global_menu.py
@@ -509,14 +509,25 @@ class GlobalMenu(AbstractMenu[None]):
 				warnings_text += f'- {_escape_markup(w)}\n'
 			warnings_text = warnings_text.rstrip('\n') + '[/yellow]'
 
+		blocks = ''
+
 		if missing := self._missing_configs():
 			text = f'[red]{_escape_markup(tr("Missing configurations:"))}\n'
 			for m in missing:
 				text += f'- {_escape_markup(m)}\n'
-			return text.rstrip('\n') + '[/red]' + warnings_text
+			blocks += text.rstrip('\n') + '[/red]'
 
-		if error := self._validate_bootloader():
-			return f'[red]{_escape_markup(tr(f"Invalid configuration: {error}"))}[/red]' + warnings_text
+		disk_item = self._item_group.find_by_key('disk_config')
+		if disk_item.has_value():
+			if error := self._validate_bootloader():
+				if blocks:
+					blocks += '\n\n'
+				text = f'[red]{_escape_markup(tr("Invalid configuration:"))}\n'
+				text += f'- {_escape_markup(error)}'
+				blocks += text + '[/red]'
+
+		if blocks:
+			return blocks + warnings_text
 
 		summary = config_output.as_summary()
 		if summary:
diff --git a/archinstall/tui/ui/components.py b/archinstall/tui/ui/components.py
index 405f59af..07bf9d90 100644
--- a/archinstall/tui/ui/components.py
+++ b/archinstall/tui/ui/components.py
@@ -5,7 +5,7 @@ from dataclasses import dataclass, replace
 from enum import Enum, auto
 from typing import Any, ClassVar, Literal, TypeVar, cast, override
 
-from rich.markup import escape as _escape_markup
+from rich.text import Text
 from textual import work
 from textual.app import App, ComposeResult
 from textual.binding import Binding, BindingsMap
@@ -281,7 +281,7 @@ class OptionListScreen(BaseScreen[ValueT]):
 				with Container():
 					yield option_list
 					yield Rule(orientation=rule_orientation)
-					yield ScrollableContainer(Label('', id='preview_content', markup=True))
+					yield ScrollableContainer(Label('', id='preview_content', markup=False))
 
 		if self._filter:
 			yield Input(placeholder='/filter', id='filter-input')
@@ -360,9 +360,8 @@ class OptionListScreen(BaseScreen[ValueT]):
 			maybe_preview = item.preview_action(item)
 
 			if maybe_preview is not None:
-				if not item.preview_markup:
-					maybe_preview = _escape_markup(maybe_preview)
-				preview_widget.update(maybe_preview)
+				content = Text.from_markup(maybe_preview) if item.preview_markup else maybe_preview
+				preview_widget.update(content)
 				return
 
 		preview_widget.update('')
@@ -513,7 +512,7 @@ class SelectListScreen(BaseScreen[ValueT]):
 				with Container():
 					yield selection_list
 					yield Rule(orientation=rule_orientation)
-					yield ScrollableContainer(Label('', id='preview_content', markup=True))
+					yield ScrollableContainer(Label('', id='preview_content', markup=False))
 
 		if self._filter:
 			yield Input(placeholder='/filter', id='filter-input')
@@ -604,9 +603,8 @@ class SelectListScreen(BaseScreen[ValueT]):
 		if item.preview_action is not None:
 			maybe_preview = item.preview_action(item)
 			if maybe_preview is not None:
-				if not item.preview_markup:
-					maybe_preview = _escape_markup(maybe_preview)
-				preview_widget.update(maybe_preview)
+				content = Text.from_markup(maybe_preview) if item.preview_markup else maybe_preview
+				preview_widget.update(content)
 				return
 
 		preview_widget.update('')
@@ -693,7 +691,7 @@ class ConfirmationScreen(BaseScreen[ValueT]):
 				yield Rule(orientation='horizontal')
 				if self._preview_header is not None:
 					yield Label(self._preview_header, classes='preview-header', id='preview_header')
-				yield ScrollableContainer(Label('', id='preview_content', markup=True))
+				yield ScrollableContainer(Label('', id='preview_content', markup=False))
 
 		yield Footer()
 
@@ -731,9 +729,8 @@ class ConfirmationScreen(BaseScreen[ValueT]):
 					else:
 						text = focused.preview_action(focused)
 						if text is not None:
-							if not focused.preview_markup:
-								text = _escape_markup(text)
-							preview.update(text)
+							content = Text.from_markup(text) if focused.preview_markup else text
+							preview.update(content)
 			else:
 				button.remove_class('-active')
 
@@ -1023,7 +1020,7 @@ class TableSelectionScreen(BaseScreen[ValueT]):
 					yield Rule(orientation='horizontal')
 					if self._preview_header is not None:
 						yield Label(self._preview_header, classes='preview-header', id='preview-header')
-					yield ScrollableContainer(Label('', id='preview_content', markup=True))
+					yield ScrollableContainer(Label('', id='preview_content', markup=False))
 
 		yield Footer()
 
@@ -1133,9 +1130,8 @@ class TableSelectionScreen(BaseScreen[ValueT]):
 
 		maybe_preview = item.preview_action(item)
 		if maybe_preview is not None:
-			if not item.preview_markup:
-				maybe_preview = _escape_markup(maybe_preview)
-			preview_widget.update(maybe_preview)
+			content = Text.from_markup(maybe_preview) if item.preview_markup else maybe_preview
+			preview_widget.update(content)
 			return
 
 		preview_widget.update('')