diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 1ee841e9bf..07e11e84ba 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1061,6 +1061,8 @@ void ScreenGameplay::LoadNextSong()
 {
 	GAMESTATE->ResetMusicStatistics();
 
+	GAMESTATE->m_bGameplayLeadIn.Set( true );
+
 	FOREACH_EnabledPlayerInfoNotDummy( m_vPlayerInfo, pi )
 	{
 		pi->GetPlayerStageStats()->iSongsPlayed++;
@@ -2315,7 +2317,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 			SOUND->PlayOnceFromAnnouncer( "gameplay here we go normal" );
 
 		m_Go.StartTransitioning( SM_None );
-		GAMESTATE->m_bPastHereWeGo.Set( true );
+		GAMESTATE->m_bGameplayLeadIn.Set( false );
 		m_DancingState = STATE_DANCING;		// STATE CHANGE!  Now the user is allowed to press Back
 	}
 	else if( SM == SM_NotesEnded )	// received while STATE_DANCING
@@ -2492,7 +2494,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		COMMAND( m_sprCourseSongNumber, "ChangeOut" );
 
 		LoadNextSong();
-		GAMESTATE->m_bPastHereWeGo.Set( true );
+		GAMESTATE->m_bGameplayLeadIn.Set( false );
 
 		m_NextSong.Reset();
 		m_NextSong.PlayCommand( "Finish" );