diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index d47c691490..bb6d299bbf 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -728,19 +728,6 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 
 	SCREENMAN->PlayStartSound();
 
-	if( OPTIONS_MENU_AVAILABLE )
-	{
-		// show "hold START for options"
-		this->PlayCommand( "ShowPressStartForOptions" );
-
-		m_bAllowOptionsMenu = true;
-		/* Don't accept a held START for a little while, so it's not
-		 * hit accidentally.  Accept an initial START right away, though,
-		 * so we don't ignore deliberate fast presses (which would be
-		 * annoying). */
-		this->PostScreenMessage( SM_AllowOptionsMenuRepeat, 0.5f );
-	}
-
 	/* If we're currently waiting on song assets, abort all except the music and
 	 * start the music, so if we make a choice quickly before background requests
 	 * come through, the music will still start. */
@@ -750,6 +737,17 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 
 	if( OPTIONS_MENU_AVAILABLE )
 	{
+		// show "hold START for options"
+		this->PlayCommand( "ShowPressStartForOptions" );
+
+		m_bAllowOptionsMenu = true;
+
+		/* Don't accept a held START for a little while, so it's not
+		 * hit accidentally.  Accept an initial START right away, though,
+		 * so we don't ignore deliberate fast presses (which would be
+		 * annoying). */
+		this->PostScreenMessage( SM_AllowOptionsMenuRepeat, 0.5f );
+
 		StartTransitioningScreen( SM_None );
 		float fTime = max( SHOW_OPTIONS_MESSAGE_SECONDS, this->GetTweenTimeLeft() );
 		this->PostScreenMessage( SM_BeginFadingOut, fTime );