diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index b4e64b6a9e..0bdc622fce 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -544,7 +544,7 @@ bool M_Responder (event_t *ev)
 				}
 			}
 		}
-		else if (ev->type == EV_KeyDown || ev->type == EV_KeyUp)
+		else if (menuactive != MENU_WaitKey && (ev->type == EV_KeyDown || ev->type == EV_KeyUp))
 		{
 			keyup = ev->type == EV_KeyUp;