diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 4ce7ae70a3..dff975c542 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -708,16 +708,6 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
 	}
 }
 
-void MusicWheel::NotesOrTrailChanged( PlayerNumber pn )	// update grade graphics and top score
-{
-	for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
-	{
-		MusicWheelItem *display = (MusicWheelItem *) m_WheelBaseItems[i]; // XXX: ugly cast
-
-		display->RefreshGrades();
-	}
-}
-
 void MusicWheel::UpdateSwitch()
 {
 	switch( m_WheelState )
diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h
index 1e2cb9ce3b..48aa605415 100644
--- a/stepmania/src/MusicWheel.h
+++ b/stepmania/src/MusicWheel.h
@@ -35,8 +35,6 @@ public:
 	void StartRandom();
 	bool IsRouletting() const;
 
-	void NotesOrTrailChanged( PlayerNumber pn );	// update grade graphics and top score
-
 	virtual bool Select();				// return true if this selection ends the screen
 	WheelItemType	GetSelectedType()	{ return GetCurWheelItemData(m_iSelection)->m_Type; }
 	Song		*GetSelectedSong();
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 3c69155dc7..4986d3434c 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -102,6 +102,13 @@ MusicWheelItem::MusicWheelItem( RString sType ):
 		m_pGradeDisplay[p]->SetXY( GRADE_X.GetValue(p), 0 );
 		this->AddChild( m_pGradeDisplay[p] );
 	}
+
+	this->SubscribeToMessage( Message_CurrentStepsP1Changed );
+	this->SubscribeToMessage( Message_CurrentStepsP2Changed );
+	this->SubscribeToMessage( Message_CurrentTrailP1Changed );
+	this->SubscribeToMessage( Message_CurrentTrailP2Changed );
+	this->SubscribeToMessage( Message_PreferredDifficultyP1Changed );
+	this->SubscribeToMessage( Message_PreferredDifficultyP2Changed );
 }
 
 MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
@@ -299,6 +306,19 @@ void MusicWheelItem::RefreshGrades()
 	}
 }
 
+void MusicWheelItem::HandleMessage( const RString& sMessage )
+{
+	if( sMessage == MessageToString(Message_CurrentStepsP1Changed) ||
+		sMessage == MessageToString(Message_CurrentStepsP2Changed) ||
+		sMessage == MessageToString(Message_CurrentTrailP1Changed) ||
+		sMessage == MessageToString(Message_CurrentTrailP2Changed) ||
+		sMessage == MessageToString(Message_PreferredDifficultyP1Changed) ||
+		sMessage == MessageToString(Message_PreferredDifficultyP2Changed) )
+		RefreshGrades();
+
+	Actor::HandleMessage( sMessage );
+}
+
 /*
  * (c) 2001-2004 Chris Danford, Chris Gomez, Glenn Maynard
  * All rights reserved.
diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h
index fc31043966..2d8244266a 100644
--- a/stepmania/src/MusicWheelItem.h
+++ b/stepmania/src/MusicWheelItem.h
@@ -26,6 +26,7 @@ public:
 	virtual Actor *Copy() const { return new MusicWheelItem(*this); }
 
 	virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
+	virtual void HandleMessage( const RString& sMessage );
 	void RefreshGrades();
 
 	const WheelItemData *data;
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 040c6e80c1..9fa1d559b2 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -511,8 +511,6 @@ void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn )
 		m_DifficultyMeters[pn].SetFromSteps( pSteps );
 	else
 		m_DifficultyMeters[pn].SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER ); 
-
-	m_MusicWheel.NotesOrTrailChanged( pn );
 }
 
 void ScreenNetSelectMusic::MusicChanged()
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index ec869ab93a..439c9230ed 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -928,7 +928,6 @@ void ScreenSelectMusic::AfterStepsChange( const vector<PlayerNumber> &vpns )
 		m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) );
 		
 		m_DifficultyMeter[pn].SetFromGameState( pn );
-		m_MusicWheel.NotesOrTrailChanged( pn );
 	}
 }
 
@@ -957,7 +956,6 @@ void ScreenSelectMusic::AfterTrailChange( const vector<PlayerNumber> &vpns )
 		m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) );
 		
 		m_DifficultyMeter[pn].SetFromGameState( pn );
-		m_MusicWheel.NotesOrTrailChanged( pn );
 	}
 }