diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 2d4fc315d0..06f1fb9629 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -280,8 +280,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 
 	m_bTryExtraStage = 
 		GAMESTATE->HasEarnedExtraStage()  && 
-		m_ResultMode==RM_ARCADE_STAGE  &&
-		!PREFSMAN->m_bEventMode;
+		m_ResultMode==RM_ARCADE_STAGE;
 
 	//
 	// Init ResultMode-specific displays
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index c4c6be1238..127b82ef55 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1246,25 +1246,18 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 				if( GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_END_OF_SONG  &&  AllFailedEarlier() )
 				{
 					this->SendScreenMessage( SM_BeginFailed, 0 );
+					return;
 				}
+
+				m_StarWipe.CloseWipingRight( SM_None );
+
+				// do they deserve an extra stage?
+				if( GAMESTATE->HasEarnedExtraStage() )
+					this->SendScreenMessage( SM_ShowTryExtraStage, 1 );
 				else
 				{
-					m_StarWipe.CloseWipingRight( SM_None );
-
-					// do they deserve an extra stage?
-					bool bTryExtraStage = GAMESTATE->HasEarnedExtraStage();
-					if( PREFSMAN->m_bEventMode )
-						bTryExtraStage = false;
-
-					if( bTryExtraStage )
-					{
-						this->SendScreenMessage( SM_ShowTryExtraStage, 1 );
-					}
-					else
-					{
-						this->SendScreenMessage( SM_ShowCleared, 1 );
-						SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
-					}
+					this->SendScreenMessage( SM_ShowCleared, 1 );
+					SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
 				}
 			}
 		}