diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index b459e99099..0044532f27 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1,6 +1,6 @@
 from .disk import *
 from .hardware import *
-from .locale_helpers import verify_x11_keyboard_layout
+from .locale_helpers import verify_keyboard_layout, verify_x11_keyboard_layout
 from .mirrors import *
 from .storage import storage
 from .user_interaction import *
@@ -547,6 +547,8 @@ def set_x11_keyboard_language(self, language: str) -> bool:
 				self.log(f"Invalid x11-keyboard language specified: {language}", fg="red", level=logging.ERROR)
 				return False
 
+			from .systemd import Boot
+
 			with Boot(self) as session:
 				session.SysCommand(["localectl", "set-x11-keymap", '""'])