diff --git a/Kernel/Devices/HID/KeyboardDevice.cpp b/Kernel/Devices/HID/KeyboardDevice.cpp
index b967d2a86df..e71dc7143a8 100644
--- a/Kernel/Devices/HID/KeyboardDevice.cpp
+++ b/Kernel/Devices/HID/KeyboardDevice.cpp
@@ -246,11 +246,10 @@ void KeyboardDevice::key_state_changed(u8 scan_code, bool pressed)
     if (!g_caps_lock_remapped_to_ctrl && key == Key_CapsLock && pressed)
         m_caps_lock_on = !m_caps_lock_on;
 
-    if (g_caps_lock_remapped_to_ctrl && key == Key_CapsLock)
+    if (g_caps_lock_remapped_to_ctrl && key == Key_CapsLock) {
         m_caps_lock_to_ctrl_pressed = pressed;
-
-    if (g_caps_lock_remapped_to_ctrl)
         update_modifier(Mod_Ctrl, m_caps_lock_to_ctrl_pressed);
+    }
 
     if (pressed)
         event.flags |= Is_Press;