diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index b0154ad776..a22bbae8db 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -532,7 +532,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 				* so don't re-sort for them. */
 //				/* We're using sections, so use the section name as the top-level
 //				 * sort. */
-			if( so != SORT_GRADE && so != SORT_BPM )
+			if( so != SORT_BPM )
 				SortSongPointerArrayBySectionName(arraySongs, so);
 
 			// make WheelItemDatas with sections
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index afa2cfbde3..2ba4b5a11a 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -1438,12 +1438,12 @@ CString GetSectionNameFromSongAndSort( const Song* pSong, SongSortOrder so )
 		return "";
 	case SORT_GRADE:
 		{
-			for( int i=NUM_GRADES; i>GRADE_NO_DATA; i-- )
+			for( int i=GRADE_TIER_1; i<NUM_GRADES; ++i )
 			{
 				Grade g = (Grade)i;
 				int iCount = pSong->GetNumNotesWithGrade( g );
 				if( iCount > 0 )
-					return ssprintf( "%4s x %d", GradeToString(g).c_str(), iCount );
+					return ssprintf( "%4s x %d", GradeToThemedString(g).c_str(), iCount );
 			}
 			return "NO DATA";
 		}