diff --git a/src/d_main.c b/src/d_main.c
index cf24bdf37..5120e948b 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -230,7 +230,6 @@ void D_ProcessEvents(void)
 	int i;
 
 	boolean eaten;
-	boolean menuresponse = false;
 
 	G_ResetAllDeviceResponding();
 	for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
@@ -272,8 +271,10 @@ void D_ProcessEvents(void)
 			continue; // ate the event
 		}
 
+		// update keys current state
+		G_MapEventsToControls(ev);
+
 		// Menu input
-		menuresponse = true;
 #ifdef HAVE_THREADS
 		I_lock_mutex(&k_menu_mutex);
 #endif
@@ -298,12 +299,6 @@ void D_ProcessEvents(void)
 		G_Responder(ev);
 	}
 
-	// Reset menu controls when no event is processed
-	if (!menuresponse)
-	{
-		M_MapMenuControls(NULL);
-	}
-
 	// Update menu CMD
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
diff --git a/src/g_game.c b/src/g_game.c
index 59ed90232..34d74cfe3 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1813,9 +1813,6 @@ boolean G_Responder(event_t *ev)
 		}
 	}
 
-	// update keys current state
-	G_MapEventsToControls(ev);
-
 	switch (ev->type)
 	{
 		case ev_keydown:
diff --git a/src/k_menu.h b/src/k_menu.h
index b8994d1d8..17c8d4665 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -563,7 +563,6 @@ void M_SetMenuDelay(UINT8 i);
 
 void M_SortServerList(void);
 
-void M_MapMenuControls(event_t *ev);
 void M_UpdateMenuCMD(UINT8 i);
 boolean M_Responder(event_t *ev);
 boolean M_MenuButtonPressed(UINT8 pid, UINT32 bt);
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 177754fc0..038ed8047 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -261,8 +261,6 @@ boolean M_Responder(event_t *ev)
 		menuKey = ev->data1;
 	}
 
-	M_MapMenuControls(ev);
-
 	// Profiles: Control mapping.
 	// We take the WHOLE EVENT for convenience.
 	if (optionsmenu.bindcontrol)
@@ -758,15 +756,6 @@ void M_UpdateMenuCMD(UINT8 i)
 	}
 }
 
-void M_MapMenuControls(event_t *ev)
-{
-	if (ev)
-	{
-		// update keys current state
-		G_MapEventsToControls(ev);
-	}
-}
-
 boolean M_MenuButtonPressed(UINT8 pid, UINT32 bt)
 {
 	if (menucmd[pid].buttonsHeld & bt)