diff --git a/archinstall/tui/ui/components.py b/archinstall/tui/ui/components.py
index 6c78b7547c..08fa81ab3c 100644
--- a/archinstall/tui/ui/components.py
+++ b/archinstall/tui/ui/components.py
@@ -815,6 +815,12 @@ def on_input_submitted(self, event: Input.Submitted) -> None:
 
 			self.query_one('#input-failure', Label).update(failure_out)
 		else:
+			input_value = event.value
+
+			if not input_value and not self._allow_skip:
+				self.query_one('#input-failure', Label).update(tr('Input cannot be empty'))
+				return
+
 			_ = self.dismiss(Result(ResultType.Selection, _data=event.value))
 
 	def on_input_changed(self, event: Input.Changed) -> None: