diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index bcecbe35d4..70a7003c83 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1597,6 +1597,7 @@ GradeP1X=82
 GradeP2X=118
 
 [MusicWheel]
+DefaultSort=GROUP
 FadeSeconds=1
 SwitchSeconds=0.10
 RouletteSwitchSeconds=0.05
@@ -2417,10 +2418,14 @@ TimerSeconds=40
 NextScreen=ScreenSelectMusic
 
 [BeginnerHelper]
+// All X,Y coordinates are relative to the HelperX,Y
 Player1_X=-125
 Player2_X=125
 PlayerAngle=40
 DancePadAngle=36
 HelperX=320
+<<<<<<< metrics.ini
+HelperY=320=======
 HelperY=320
 
+>>>>>>> 1.303
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 106157a6da..015d587431 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -34,6 +34,7 @@
 #include "ModeChoice.h"
 
 
+#define DEFAULT_SORT				THEME->GetMetric("MusicWheel","DefaultSort")
 #define FADE_SECONDS				THEME->GetMetricF("MusicWheel","FadeSeconds")
 #define SWITCH_SECONDS				THEME->GetMetricF("MusicWheel","SwitchSeconds")
 #define ROULETTE_SWITCH_SECONDS		THEME->GetMetricF("MusicWheel","RouletteSwitchSeconds")
@@ -388,6 +389,11 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			for( unsigned j = 0; so == SORT_INVALID && j < parts.size(); ++j )
 				so = StringToSongSortOrder( parts[j] );
 
+			// If we have a valid default sort in metrics, select it.
+				so = StringToSongSortOrder(DEFAULT_SORT);
+				if( so != SORT_INVALID )
+					GAMESTATE->m_SongSortOrder = so;
+
 			if( so == SORT_INVALID )
 				so = SORT_GROUP;