diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 12d2d3f376..66ba9b5b91 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -239,12 +239,10 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 			}
 		}
 
-		SCREENMAN->ConcurrentlyPrepareScreen( m_sNextScreen );
-	}
-	else if( SM == SM_AllDoneChoosing ) 	/* It's our turn to tween out. */
-	{
 		if( !IsTransitioning() )
 			StartTransitioningScreen( SM_GoToNextScreen );
+
+		SCREENMAN->ConcurrentlyPrepareScreen( m_sNextScreen );
 	}
 	else if( SM == SM_GoToNextScreen )
 	{
diff --git a/stepmania/src/ScreenSelect.h b/stepmania/src/ScreenSelect.h
index a37f5aae88..a9b66b9f64 100644
--- a/stepmania/src/ScreenSelect.h
+++ b/stepmania/src/ScreenSelect.h
@@ -8,9 +8,6 @@
 #include "CodeDetector.h"
 #include "ThemeMetric.h"
 
-// Derived classes must send this when done
-AutoScreenMessage( SM_AllDoneChoosing )
-
 class ScreenSelect : public ScreenWithMenuElements
 {
 public:
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 36da5cb757..2f4dc5a518 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -159,18 +159,6 @@ void ScreenSelectDifficulty::Update( float fDelta )
 	m_fLockInputTime = max( 0, m_fLockInputTime-fDelta );
 }
 
-void ScreenSelectDifficulty::HandleScreenMessage( const ScreenMessage SM )
-{
-	ScreenSelect::HandleScreenMessage( SM );
-
-	switch( SM )
-	{
-	case SM_BeginFadingOut:
-		SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 );	// notify parent that we're finished
-		break;
-	}
-}
-
 int ScreenSelectDifficulty::GetSelectionIndex( PlayerNumber pn )
 {
 	int index = 0;
diff --git a/stepmania/src/ScreenSelectDifficulty.h b/stepmania/src/ScreenSelectDifficulty.h
index 48e2c51982..23d822e4e8 100644
--- a/stepmania/src/ScreenSelectDifficulty.h
+++ b/stepmania/src/ScreenSelectDifficulty.h
@@ -28,8 +28,6 @@ public:
 //	virtual void MenuBack( PlayerNumber pn );
 	virtual void TweenOffScreen();
 
-	virtual void HandleScreenMessage( const ScreenMessage SM );
-
 protected:
 	enum Page { PAGE_1, PAGE_2, NUM_PAGES };
 
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index db6af1fe92..a3baf9a121 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -312,8 +312,6 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
 	{
 		/* Backwards compatibility (deprecated). */
 		this->PlayCommand( "TweenOff" );
-
-		SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 );	// notify parent that we're finished
 	}
 }
 
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index eb9d2dcb38..3d7df35af4 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -312,7 +312,7 @@ void ScreenSelectMode::MenuStart( PlayerNumber pn )
 	for(int i=0; i<NUM_PLAYERS; i++)
 		OFF_COMMAND( m_CurChar[i] );
 
-	SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 );
+	SCREENMAN->PostMessageToTopScreen( SM_BeginFadingOut, 0 );
 }
 
 int ScreenSelectMode::GetSelectionIndex( PlayerNumber pn )
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index c98133e387..2e1057b6f4 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -205,7 +205,6 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
 
 	SCREENMAN->PlayStartSound();
 	SCREENMAN->SendMessageToTopScreen( SM_BeginFadingOut );
-	SCREENMAN->SendMessageToTopScreen( SM_AllDoneChoosing );
 
 	const GameCommand& mc = m_aGameCommands[GetSelectionIndex(pn)];
 	SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(),mc.m_sName.c_str())) );