diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index d2b4e27de1..c637519a08 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1454,7 +1454,6 @@ TryExtraStageOffCommand=linear,0.7;diffusealpha,0
 SpinGrades=1
 CheerDelaySeconds=2.5
 NoMarvelousShiftUp=15
-FailedScreen=ScreenGameOver
 
 [ScreenEvaluationSummary]
 Fallback=ScreenEvaluation
@@ -1765,9 +1764,9 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationNonstop]
 Fallback=ScreenEvaluation
-NextScreen=ScreenNameEntry
+NextScreen=ScreenSelectCourse
 EndScreen=ScreenNameEntry
-FailedScreen=ScreenGameOver
+FailedScreen=ScreenNameEntry
 Type=course
 ShowBannerArea=1
 ShowGradeArea=1
@@ -1979,9 +1978,9 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationOni]
 Fallback=ScreenEvaluation
-NextScreen=ScreenNameEntry
+NextScreen=ScreenSelectCourse
 EndScreen=ScreenNameEntry
-FailedScreen=ScreenGameOver
+FailedScreen=ScreenNameEntry
 Type=course
 ShowBannerArea=1
 ShowGradeArea=0
@@ -2189,13 +2188,12 @@ PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
 PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0
 CheerDelaySeconds=2.5
 NoMarvelousShiftUp=15
-FailedScreen=ScreenGameOver
 
 [ScreenEvaluationEndless]
 Fallback=ScreenEvaluation
-NextScreen=ScreenNameEntry
+NextScreen=ScreenSelectCourse
 EndScreen=ScreenNameEntry
-FailedScreen=ScreenGameOver
+FailedScreen=ScreenNameEntry
 Type=course
 ShowBannerArea=1
 ShowGradeArea=0
@@ -2415,7 +2413,6 @@ PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
 PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0
 CheerDelaySeconds=2.5
 NoMarvelousShiftUp=15
-FailedScreen=ScreenGameOver
 
 [ScreenEvaluationRave]
 Fallback=ScreenEvaluation