diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index c0e01b7c7b..8bf10b2738 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -432,7 +432,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		return;
 	}
 
-	if( SELECT_MENU_AVAILABLE && INPUTMAPPER->IsBeingPressed( MENU_BUTTON_SELECT, pn ) )
+	if( SELECT_MENU_AVAILABLE  &&  INPUTMAPPER->IsBeingPressed( MENU_BUTTON_SELECT, pn ) )
 	{
 		if( input.type == IET_FIRST_PRESS )
 		{
@@ -868,6 +868,11 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
 			StartTransitioningScreen( SM_BeginFadingOut );
 		}
 	}
+	else // !finalized.  Set the timer for selecting difficulty and mods.
+	{
+		m_MenuTimer->SetSeconds( 25 );
+		m_MenuTimer->Start();
+	}
 }