diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index e88a897096..e39a867ddd 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -906,9 +906,6 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
 
 	OptionRow &row = *m_Rows[iCurRow];
 	
-	if( row.GetRowType() == OptionRow::ROW_EXIT	)	// EXIT is selected
-		return;		// don't allow a move
-
 	const int iNumChoices = row.GetRowDef().choices.size();
 
 	if( m_OptionsNavigation == NAV_THREE_KEY_MENU && iNumChoices <= 1 )	// 1 or 0
@@ -922,7 +919,7 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
 		return;
 	}
 
-	if( iNumChoices == 0 )
+	if( iNumChoices <= 1 )	// nowhere to move
 		return;
 
 	if( Repeat && !ALLOW_REPEATING_CHANGE_VALUE_INPUT )