diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 399e77f514..6803353b37 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2328,8 +2328,7 @@ Use3D=0
 Wheel3DRadius=200 # Possibly safe defaults?
 CirclePercent=0.5
 MostPlayedSongsToShow=30
-SortMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
-ModeMenuChoiceNames=Preferred
+ModeMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
 ChoicePreferred=name,PREFERRED;sort,Preferred
 ChoiceGroup=name,GROUP;sort,Group
 ChoiceTitle=name,TITLE;sort,Title
@@ -2712,10 +2711,8 @@ NextSort1=MenuLeft-MenuRight-Start
 NextSort2=MenuLeft+MenuRight
 NextSort3=Left-Right-Start
 NextSort4=Left+Right
-SortMenu1=Up,Down,Up,Down
-SortMenu2=MenuUp,MenuDown,MenuUp,MenuDown
-ModeMenu1=
-ModeMenu2=
+ModeMenu1=Up,Down,Up,Down
+ModeMenu2=MenuUp,MenuDown,MenuUp,MenuDown
 Mirror=Up,Left,Right,Left,Right
 Left=Up,Down,Right,Left
 Right=Up,Down,Left,Right
@@ -2753,8 +2750,8 @@ NextSort1=
 NextSort2=
 NextSort3=
 NextSort4=
-SortMenu1=
-SortMenu2=
+ModeMenu1=
+ModeMenu2=
 
 [GrooveRadar]
 Label1OffsetX=0
diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index 057b2df21d..d63dd471e2 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -21,8 +21,6 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = {
 	"NextSort2",
 	"NextSort3",
 	"NextSort4",
-	"SortMenu1",
-	"SortMenu2",
 	"ModeMenu1",
 	"ModeMenu2",
 	"Mirror",
@@ -204,11 +202,6 @@ bool CodeDetector::EnteredNextSort( GameController controller )
 		   EnteredCode(controller,CODE_NEXT_SORT4);
 }
 
-bool CodeDetector::EnteredSortMenu( GameController controller )
-{
-	return EnteredCode(controller,CODE_SORT_MENU1) || EnteredCode(controller,CODE_SORT_MENU2);
-}
-
 bool CodeDetector::EnteredModeMenu( GameController controller )
 {
 	return EnteredCode(controller,CODE_MODE_MENU1) || EnteredCode(controller,CODE_MODE_MENU2);
diff --git a/stepmania/src/CodeDetector.h b/stepmania/src/CodeDetector.h
index 19cef30fdb..9edb7f02e8 100644
--- a/stepmania/src/CodeDetector.h
+++ b/stepmania/src/CodeDetector.h
@@ -35,8 +35,6 @@ public:
 		CODE_NEXT_SORT2,
 		CODE_NEXT_SORT3,
 		CODE_NEXT_SORT4,
-		CODE_SORT_MENU1,
-		CODE_SORT_MENU2,
 		CODE_MODE_MENU1,
 		CODE_MODE_MENU2,
 		CODE_MIRROR,
@@ -76,7 +74,6 @@ public:
 	static bool EnteredEasierDifficulty( GameController controller );
 	static bool EnteredHarderDifficulty( GameController controller );
 	static bool EnteredNextSort( GameController controller );
-	static bool EnteredSortMenu( GameController controller );
 	static bool EnteredModeMenu( GameController controller );
 	static bool DetectAndAdjustMusicOptions( GameController controller );
 	static bool EnteredCode( GameController controller, Code code );