diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index e68ad5268d..2b56643e38 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -34,7 +34,6 @@
 #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")
@@ -389,17 +388,6 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			for( unsigned j = 0; so == SORT_INVALID && j < parts.size(); ++j )
 				so = StringToSongSortOrder( parts[j] );
 
-			// I'm removing this because it always forces this sort.
-			// When using UDUD to change sort, it won't change. 
-			/*
-			if ( !GAMESTATE->IsCourseMode() )
-			{	
-				// 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;
 
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index bfefc0fa01..42d1c1e63a 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -38,6 +38,7 @@
 
 const int NUM_SCORE_DIGITS	=	9;
 
+#define DEFAULT_SORT						THEME->GetMetric ("ScreenSelectMusic","DefaultSort")
 #define FOV									THEME->GetMetricF("ScreenSelectMusic","FOV")
 #define BANNER_WIDTH						THEME->GetMetricF("ScreenSelectMusic","BannerWidth")
 #define BANNER_HEIGHT						THEME->GetMetricF("ScreenSelectMusic","BannerHeight")
@@ -247,6 +248,12 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic")
 	m_fPlaySampleCountdown = 0;
 	m_bAllowOptionsMenu = m_bAllowOptionsMenuRepeat = false;
 
+	// If there is a default sort requested..use it.
+	SongSortOrder	so;
+	so = StringToSongSortOrder(DEFAULT_SORT);
+	if( so != SORT_INVALID )
+		GAMESTATE->m_SongSortOrder = so;
+
 	UpdateOptionsDisplays();
 
 	AfterMusicChange();