diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 2bb7578fac..350ead6129 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -83,7 +83,7 @@ Choice1=@"ApplyDefaultOptions;screen,"..ScreenCautionBranch()..";text,Game Start
 Choice2=screen,ScreenSelectGame;text,Select Game
 Choice3=screen,ScreenOptionsService;text,Options
 Choice4=screen,ScreenEditMenu;text,Edit/Sync Songs
-Choice5=screen,ScreenCourseManager;text,Edit Courses
+Choice5=screen,ScreenOptionsManageCourses;text,Edit Courses
 Choice6=screen,ScreenJukeboxMenu;text,Jukebox
 Choice7=screen,ScreenExit;text,Exit
 Choice8=screen,ScreenTest;text,Sandbox
@@ -4528,7 +4528,7 @@ Fallback=ScreenGameplay DifficultyMeterP2
 Class=ScreenOptionsManageCourses
 Fallback=ScreenOptionsSimple
 EditMode=2
-PrevScreen=ScreenSelectEditMode
+PrevScreen=ScreenTitleMenu
 NextScreen=ScreenOptionsEditCourse
 PrepareScreens=ScreenMiniMenuContext
 GroupedScreens=ScreenMiniMenuContext
@@ -5102,4 +5102,4 @@ CourseHandsLabelGainFocusCommand=
 CourseHandsLabelLoseFocusCommand=
 
 [PaneDisplayP2]
-Fallback=PaneDisplayP1
\ No newline at end of file
+Fallback=PaneDisplayP1