diff --git a/src/specific/s_input.c b/src/specific/s_input.c
index 4a5d3d083..85962370d 100644
--- a/src/specific/s_input.c
+++ b/src/specific/s_input.c
@@ -196,6 +196,7 @@ static void S_Input_DInput_KeyboardRead()
             break;
         }
     }
+    S_Shell_SpinMessageLoop();
 }
 
 static bool S_Input_KbdKey(INPUT_KEY key, INPUT_LAYOUT layout)
@@ -411,7 +412,6 @@ static HRESULT DInputJoystickPoll(DIJOYSTATE2 *joystate)
 INPUT_STATE S_Input_GetCurrentState()
 {
     S_Input_DInput_KeyboardRead();
-    S_Shell_SpinMessageLoop();
 
     INPUT_STATE linput = { 0 };