diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index 7d30634bcd..224c460cd3 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -122,7 +122,7 @@ local function GetEvaluationNextScreenInternal( sNextScreen, sFailedScreen, sEnd
 end
 
 function GetEvaluationSummaryNextScreen()
-	return GetEvaluationNextScreenInternal( "ScreenNameEntry", "ScreenGameOver", "ScreenNameEntry" );
+	return GetEvaluationNextScreenInternal( "ScreenNameEntry", "ScreenProfileSave", "ScreenNameEntry" );
 end
 
 function GetEvaluationNextScreen()
@@ -131,7 +131,7 @@ function GetEvaluationNextScreen()
 	local pm = GAMESTATE:GetPlayMode();
 	if pm == "PlayMode_Regular" or
 		pm == "PlayMode_Rave" then
-		sFailedScreen = "ScreenGameOver";
+		sFailedScreen = "ScreenProfileSave";
 		sEndScreen = "ScreenEvaluationSummary";
 	elseif pm == "PlayMode_Nonstop" or
 		pm == "PlayMode_Oni" or
@@ -157,6 +157,11 @@ function ScreenBranchNetAfterEval()
 end	
 
 function SelectEndingScreen()
+	local bIsExtraStage = GAMESTATE:IsAnExtraStage()
+	if STATSMAN:GetCurStageStats():AllFailed() and not bIsExtraStage then
+		return "ScreenGameOver"
+	end
+
 	local grade = STATSMAN:GetBestFinalGrade()
 	if Grade:Compare( grade, "Grade_Tier03" ) >= 0 then return "ScreenMusicScroll" end
 	return "ScreenCredits"
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 5f4027a3ed..8a43251d3c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -132,6 +132,20 @@ Fallback="ScreenSelectMasterBlank"
 PrevScreen=ScreenTitleBranch()
 Choice1="screen,ScreenSelectStyle"
 
+[ScreenProfileLoad]
+Class="ScreenProfileLoad"
+Fallback="ScreenWithMenuElements"
+NextScreen=SongSelectionScreen()
+PrevScreen=ScreenTitleBranch()
+TimerSeconds=-1
+
+[ScreenProfileSave]
+Class="ScreenProfileSave"
+Fallback="ScreenWithMenuElements"
+NextScreen=SelectEndingScreen()
+PrevScreen=ScreenTitleBranch()
+TimerSeconds=-1
+
 [ScreenEz2SelectPlayer]
 Fallback="ScreenWithMenuElements"
 JoinFrameP1X=SCREEN_CENTER_X-200
@@ -3044,7 +3058,7 @@ TimerSeconds=24
 TimerStealth=false
 StyleIcon=false
 MaxRankingNameLength=4
-NextScreen=SelectEndingScreen()
+NextScreen="ScreenProfileSave"
 PlayerP1OnePlayerOneSideX=SCREEN_CENTER_X-160
 PlayerP2OnePlayerOneSideX=SCREEN_CENTER_X+160
 PlayerP1TwoPlayersTwoSidesX=SCREEN_CENTER_X-160
@@ -3314,7 +3328,7 @@ SleepAfterTweenOffSeconds=0.8
 TimerSeconds=40
 StyleIcon=true
 PrevScreen=ScreenTitleBranch()
-NextScreen=SongSelectionScreen()
+NextScreen="ScreenProfileLoad"
 
 [BeginnerHelper]
 # All X,Y coordinates are relative to the HelperX,Y