diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 1ccc490b63..b9840d0e44 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -771,15 +771,12 @@ bool InputMapper::GameToDevice( const GameInput &GameI, int iSoltNum, DeviceInpu
 	return DeviceI.device != DEVICE_NONE;
 }
 
-void InputMapper::GameToStyle( const GameInput &GameI, StyleInput &StyleI )
+StyleInput InputMapper::GameToStyle( const GameInput &GameI )
 {
 	if( GAMESTATE->m_pCurStyle == NULL )
-	{
-		StyleI.MakeInvalid();
-		return;
-	}
+		return StyleInput_INVALID;
 
-	StyleI = GAMESTATE->m_pCurStyle->GameInputToStyleInput( GameI );
+	return GAMESTATE->m_pCurStyle->GameInputToStyleInput( GameI );
 }
 
 void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI )
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index db81343548..f171dd1672 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1404,11 +1404,6 @@ void HandleInputEvents(float fDeltaTime)
 		
 		if( input.GameI.IsValid()  &&  input.type == IET_FIRST_PRESS )
 			INPUTQUEUE->RememberInput( input );
-		if( input.GameI.IsValid() )
-		{
-			INPUTMAPPER->GameToMenu( input.GameI, input.MenuI );
-			INPUTMAPPER->GameToStyle( input.GameI, input.StyleI );
-		}
 
 		input.mp = MultiPlayer_INVALID;
 		
@@ -1428,13 +1423,8 @@ void HandleInputEvents(float fDeltaTime)
 					{
 						input.GameI = gi;
 						//LOG->Trace( "game %d %d", input.GameI.controller, input.GameI.button );
-						INPUTMAPPER->GameToStyle( input.GameI, input.StyleI );
-						INPUTMAPPER->GameToMenu( input.GameI, input.MenuI );
 					}
 
-					//LOG->Trace( "style %d %d", input.StyleI.player, input.StyleI.col );
-					//LOG->Trace( "menu %d %d", input.MenuI.player, input.MenuI.button );
-
 					input.mp = InputMapper::InputDeviceToMultiPlayer( input.DeviceI.device );
 					//LOG->Trace( "multiplayer %d", input.mp );
 					ASSERT( input.mp >= 0 && input.mp < NUM_MultiPlayer );					
@@ -1442,6 +1432,12 @@ void HandleInputEvents(float fDeltaTime)
 			}
 		}
 
+		if( input.GameI.IsValid() )
+		{
+			INPUTMAPPER->GameToMenu( input.GameI, input.MenuI );
+			INPUTMAPPER->GameToStyle( input.GameI, input.StyleI );
+		}
+
 		if( HandleGlobalInputs(input) )
 			continue;	// skip