diff --git a/src/kernel/boot.c b/src/kernel/boot.c
index 0f74460..fbbb909 100644
--- a/src/kernel/boot.c
+++ b/src/kernel/boot.c
@@ -39,10 +39,10 @@ void init_boot(int debug_info) {
   dprintf("[\e[0;32mSystem\e[0m] Initialized PMM\n");
   pit_init();
   dprintf("[\e[0;32mSystem\e[0m] Initialized PIT\n");
-  init_keyboard();
-  dprintf("[\e[0;32mSystem\e[0m] Initialized Keyboard\n");
   mouse_init();
   dprintf("[\e[0;32mSystem\e[0m] Initialized Mouse\n");
+  init_keyboard();
+  dprintf("[\e[0;32mSystem\e[0m] Initialized Keyboard\n");
   register_irqs();
   dprintf("[\e[0;32mSystem\e[0m] Registered IRQs\n");
   rd = init_rd();
diff --git a/src/system/wm/wm.c b/src/system/wm/wm.c
index 21fa8fc..ef28608 100644
--- a/src/system/wm/wm.c
+++ b/src/system/wm/wm.c
@@ -28,7 +28,6 @@ void init_taskbar() {
 }
 
 void init_wm() {
-  keyboard.out = 0;
   init_wallpaper();
   init_taskbar();
 
@@ -45,4 +44,5 @@ void init_wm() {
   }
 
   should_draw_cursor = true;
+  keyboard.out = true;
 }
\ No newline at end of file