diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index b02e60c91c..5c118e995e 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -212,7 +212,7 @@ void GameState::PlayersFinalized()
 			GAMESTATE->ApplyModifiers( pn, pProfile->m_sDefaultModifiers );
 		}
 		// Only set the sort order if it wasn't already set by a ModeChoice
-		if( m_SortOrder == SORT_INVALID )
+		if( m_SortOrder == SORT_INVALID && pProfile->m_SortOrder != SORT_INVALID )
 			m_SortOrder = pProfile->m_SortOrder;
 		if( pProfile->m_PreferredDifficulty != DIFFICULTY_INVALID )
 			GAMESTATE->m_PreferredDifficulty[pn] = pProfile->m_PreferredDifficulty;