diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index a1e0b317c3..8b624bd4b8 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -415,10 +415,11 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
 			/* This player is currently on a choice that is no longer available due to
 			 * the selection just made. */
 			int iSwitchToIndex = -1;
-			for( int i=m_iChoiceOnPage[p]+1; iSwitchToIndex == -1 && i < (int) m_ModeChoices[m_CurrentPage].size(); ++i )
+			int i;
+			for( i=m_iChoiceOnPage[p]+1; iSwitchToIndex == -1 && i < (int) m_ModeChoices[m_CurrentPage].size(); ++i )
 				if( m_ModeChoices[m_CurrentPage][i].IsPlayable() )
 					iSwitchToIndex = i;
-			if( iSwitchToIndex == -1 )
+			if( iSwitchToIndex == -1 ) /* couldn't find a spot looking up; look down */
 			{
 				for( i=m_iChoiceOnPage[p]-1; iSwitchToIndex == -1 && i >= 0; --i )
 					if( m_ModeChoices[m_CurrentPage][i].IsPlayable() )