diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 653e60a0dc..abbef92569 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1403,10 +1403,14 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
 
 	Profile *pProf = PROFILEMAN->GetProfile(pn);
 
+	// Check for feats even if the PlayMode is rave or battle because the player may have
+	// made high scores then switched modes.
 	CHECKPOINT_M(ssprintf("PlayMode %i",this->m_PlayMode));
 	switch( this->m_PlayMode )
 	{
 	case PLAY_MODE_REGULAR:
+	case PLAY_MODE_BATTLE:
+	case PLAY_MODE_RAVE:
 		{
 			CHECKPOINT;
 
@@ -1552,9 +1556,6 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
 			}
 		}
 		break;
-	case PLAY_MODE_BATTLE:
-	case PLAY_MODE_RAVE:
-		break;
 	case PLAY_MODE_NONSTOP:
 	case PLAY_MODE_ONI:
 	case PLAY_MODE_ENDLESS: