diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 0ba638430c..95b03168ba 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -564,9 +564,10 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM )
 		m_Fade.CloseWipingRight( SM_GoToNextScreen );
 		break;
 	case SM_DoneFadingIn:
+		SCREENMAN->PrepNewScreen( "ScreenGameplay" );
 		break;
 	case SM_GoToNextScreen:
-		SCREENMAN->SetNewScreen( "ScreenGameplay" );
+		SCREENMAN->PrepNewScreen( "" ); /* use prepped */
 		break;
 	}
 }