diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 75a7a59cab..427d9f7ed0 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -559,6 +559,13 @@ void ScreenManager::RunConcurrentlyPrepareScreen()
 	ScreenMessage SM = m_OnDonePreparingScreen;
 	m_OnDonePreparingScreen = SM_None;
 
+	/* If the screen is already prepared, we're all set. */
+	if( ScreenIsPrepped(sScreenName) )
+	{
+		SendMessageToTopScreen( SM );
+		return;
+	}
+
 	g_bIsConcurrentlyLoading = true;
 	StartConcurrentRendering();