diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 8aae564795..43d996c9d1 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -763,11 +763,7 @@ void ScreenEvaluation::Input( const InputEventPlus &input )
 
 void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
 {
-	if( SM == SM_MenuTimer )
-	{
-		HandleMenuStart();
-	}
-	else if( SM == SM_PlayCheer )
+	if( SM == SM_PlayCheer )
 	{
 		SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") );
 	}
@@ -803,6 +799,9 @@ void ScreenEvaluation::MenuBack( const InputEventPlus &input )
 
 void ScreenEvaluation::MenuStart( const InputEventPlus &input )
 {
+	if( IsTransitioning() )
+		return;
+
 	m_soundStart.Play();
 
 	HandleMenuStart();