diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index e45e7c042b..81b469b7a8 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -771,8 +771,15 @@ PlayerNumber InputMapper::ControllerToPlayerNumber( GameController controller )
 
 void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI )
 {
+	MenuI = MenuInput();	// invalid GameInput
+
 	const Game* pGame = GAMESTATE->GetCurrentGame();
-	MenuI = pGame->GameInputToMenuInput( GameI );
+
+	MenuButton mb = pGame->GameInputToMenuButton( GameI );
+	if( mb == MenuButton_INVALID )
+		return;
+
+	MenuI.button = mb;
 }
 
 void InputMapper::MenuToGame( const MenuInput &MenuI, PlayerNumber pn, GameInput GameIout[4] )