diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 42de0ddcc4..246837f593 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -782,14 +782,11 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 	case TYPE_RANDOM:
 	case TYPE_SORT:
 		/* We havn't made a selection yet. */
-		break;
+		return;
 	default:
 		ASSERT(0);
 	}
 
-	if( !m_bMadeChoice )
-		return;
-
 	SCREENMAN->PlayStartSound();
 
 	if( OPTIONS_MENU_AVAILABLE )