diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index f4eeb1fac8..6e17529b1f 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -1381,7 +1381,10 @@ void ScreenEvaluation::EndScreen()
 
 	if( PREFSMAN->m_bEventMode )
 	{
-		m_Menu.StartTransitioning( SM_GoToNextScreen );
+		if( GAMESTATE->IsCourseMode() )
+			m_Menu.StartTransitioning( SM_GoToSelectCourse );
+		else
+			m_Menu.StartTransitioning( SM_GoToNextScreen );
 	}
 	else	// not event mode
 	{