diff --git a/src/Screen.cpp b/src/Screen.cpp
index 45f1841d69..7b997ece81 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -184,7 +184,10 @@ void Screen::Input( const InputEventPlus &input )
 {
 	Message msg("");
 	if( m_Codes.InputMessage(input, msg) )
+	{
 		this->HandleMessage( msg );
+		return;
+	}
 
 	// Don't send release messages with the default handler.
 	switch( input.type )
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 4c717f1888..d8717a790e 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -2174,8 +2174,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
 			if( m_PauseController == GameController_Invalid || m_PauseController == input.GameI.controller )
 			{
 				// IMO, it's better to have this configurable. -DaisuMaster
-				if( UNPAUSE_WITH_START )
-					this->PauseGame( false );
+				if( UNPAUSE_WITH_START ) this->PauseGame( false );
 			}
 		}
 		return;
diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
index 0b632f26cb..3cbd0ed233 100644
--- a/src/ScreenSelectMusic.cpp
+++ b/src/ScreenSelectMusic.cpp
@@ -385,6 +385,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 {
 //	LOG->Trace( "ScreenSelectMusic::Input()" );
 
+	ScreenWithMenuElements::Input( input );
+
 	bool bHoldingCtrl = 
 		INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL)) ||
 		INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL));
@@ -825,7 +827,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 	if( input.type == IET_FIRST_PRESS && DetectCodes(input) )
 		return;
 
-	ScreenWithMenuElements::Input( input );
+	//ScreenWithMenuElements::Input( input );
 }
 
 bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )