diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index bc976ea85c..43d57ce60f 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -40,3 +40,38 @@ function SelectEndingScreen()
 	return "ScreenCredits"
 end	
 
+function IsEventMode()
+	return GetPreference( "EventMode" )
+end
+
+-- For "EvalOnFail", do:
+-- function GetGameplayNextScreen() return SelectEvaluationScreen() end
+
+function GetGameplayNextScreen()
+	Trace( "GetGameplayNextScreen: " )
+	if( Passed ) then
+		Trace( "Passed" )
+	else
+		Trace( "Failed" )
+	end
+	if IsCourseMode() then Trace( "Course mode " ) end
+	if IsExtraStage() then Trace( "Ex1" ) end
+	if IsExtraStage2() then Trace( "Ex2" ) end
+	if IsEventMode() then Trace( "Event mode" ) end
+	if Passed or IsCourseMode() or
+		IsExtraStage() or IsExtraStage2()
+	then
+		Trace( "Go to evaluation screen" )
+		return SelectEvaluationScreen()
+	end
+
+	if IsEventMode() then
+		Trace( "Go to song selection screen" )
+		-- DeletePreparedScreens()
+		return SongSelectionScreen()
+	end
+
+	Trace( "ScreenGameOver" )
+	return "ScreenGameOver"
+end
+
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index cc598c54ac..8cca0bc61d 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1020,7 +1020,7 @@ ShowEvaluationOnFail=0
 StaticBGY=SCREEN_CENTER_Y+0
 StaticBGX=SCREEN_CENTER_X+0
 PrevScreen=@SongSelectionScreen()
-NextScreen=@SelectEvaluationScreen()
+NextScreen=@GetGameplayNextScreen()
 InitialBackgroundBrightnessRegular=1
 InitialBackgroundBrightnessNonstop=1
 InitialBackgroundBrightnessOni=1