diff --git a/doomsday/engine/portable/src/dd_input.c b/doomsday/engine/portable/src/dd_input.c
index af0107dbcc..41912368b7 100644
--- a/doomsday/engine/portable/src/dd_input.c
+++ b/doomsday/engine/portable/src/dd_input.c
@@ -355,11 +355,6 @@ void I_DeviceReset(uint ident)
 
     DEBUG_Message(("I_DeviceReset: %s.\n", Str_Text(I_DeviceNameStr(ident))));
 
-    if(ident == IDEV_KEYBOARD)
-    {
-        altDown = shiftDown = false;
-    }
-
     for(k = 0; k < (int)dev->numKeys && dev->keys; ++k)
     {
         if(dev->keys[k].isDown)
@@ -382,6 +377,12 @@ void I_DeviceReset(uint ident)
             dev->axes[k].position = 0;
         }
     }
+
+    if(ident == IDEV_KEYBOARD)
+    {
+        altDown = shiftDown = false;
+        DD_ClearKeyRepeaters();
+    }
 }
 
 void I_ResetAllDevices(void)