diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index cc07b0172..031816dfb 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -6760,10 +6760,7 @@ MAIN_LOOP_RESTART:
         if (((g_netClient || g_netServer) || !(g_player[myconnectindex].ps->gm & (MODE_MENU|MODE_DEMO))) && totalclock >= ototalclock+TICSPERFRAME)
         {
             if (g_networkMode != NET_DEDICATED_SERVER)
-            {
-                CONTROL_ProcessBinds();
                 P_GetInput(myconnectindex);
-            }
 
             Bmemcpy(&inputfifo[0][myconnectindex], &localInput, sizeof(input_t));
 
diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp
index cac634693..be83f8d54 100644
--- a/source/duke3d/src/player.cpp
+++ b/source/duke3d/src/player.cpp
@@ -2885,6 +2885,8 @@ void P_GetInput(int playerNum)
         return;
     }
 
+    CONTROL_ProcessBinds();
+
     if (ud.mouseaiming)
         g_myAimMode = BUTTON(gamefunc_Mouse_Aiming);
     else