diff --git a/stepmania/src/OptionsList.cpp b/stepmania/src/OptionsList.cpp
index 4ebe30f8a0..6931fb0f6b 100644
--- a/stepmania/src/OptionsList.cpp
+++ b/stepmania/src/OptionsList.cpp
@@ -393,12 +393,13 @@ void OptionsList::Input( const InputEventPlus &input )
 
 	if( input.MenuI == MENU_BUTTON_LEFT )
 	{
-		if( input.type != IET_FIRST_PRESS )
+		if( input.type == IET_RELEASE )
 			return;
 
 		if( INPUTMAPPER->IsBeingPressed(MENU_BUTTON_RIGHT, pn) )
 		{
-			SwitchMenu( -1 );
+			if( input.type == IET_FIRST_PRESS )
+				SwitchMenu( -1 );
 			return;
 		}
 
@@ -413,12 +414,13 @@ void OptionsList::Input( const InputEventPlus &input )
 	}
 	else if( input.MenuI == MENU_BUTTON_RIGHT )
 	{
-		if( input.type != IET_FIRST_PRESS )
+		if( input.type == IET_RELEASE )
 			return;
 
 		if( INPUTMAPPER->IsBeingPressed(MENU_BUTTON_LEFT, pn) )
 		{
-			SwitchMenu( +1 );
+			if( input.type == IET_FIRST_PRESS )
+				SwitchMenu( +1 );
 			return;
 		}