diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 250b5f3fde..f935c8df90 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -66,8 +66,6 @@ void NoteField::Load( NoteData* pNoteData, PlayerNumber pn, int iFirstPixelToDra
 	// init note displays
 	for( int c=0; c<GetNumTracks(); c++ ) 
 		m_NoteDisplay[c].Load( c, pn );
-
-	m_sLastSeenNoteSkin = GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin;
 	
 	ASSERT( GetNumTracks() == GAMESTATE->GetCurrentStyleDef()->m_iColsPerPlayer );
 }
@@ -81,12 +79,6 @@ void NoteField::ReloadNoteSkin()
 
 void NoteField::Update( float fDeltaTime )
 {
-	if( m_sLastSeenNoteSkin != GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin )
-	{
-		ReloadNoteSkin();
-		m_sLastSeenNoteSkin = GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin;
-	}
-
 	m_rectMarkerBar.Update( fDeltaTime );
 
 	if( m_fPercentFadeToFail >= 0 )
diff --git a/stepmania/src/NoteField.h b/stepmania/src/NoteField.h
index abe108bcd6..c9eea8aa78 100644
--- a/stepmania/src/NoteField.h
+++ b/stepmania/src/NoteField.h
@@ -40,9 +40,9 @@ public:
 	float	m_fBeginMarker, m_fEndMarker;	// only used with MODE_EDIT
 
 	void FadeToFail();
+	void ReloadNoteSkin();
 
 protected:
-	void ReloadNoteSkin();
 	void DrawBeatBar( const float fBeat );
 	void DrawMarkerBar( const float fBeat );
 	void DrawAreaHighlight( const float fStartBeat, const float fEndBeat );
@@ -65,7 +65,6 @@ protected:
 	BitmapText		m_textMeasureNumber;
 	Quad			m_rectMarkerBar;
 	Quad			m_rectAreaHighlight;
-	CString			m_sLastSeenNoteSkin;
 };
 
 #endif
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 218543eb93..22883f6620 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -318,6 +318,15 @@ void Player::Update( float fDeltaTime )
 				CrossedRow( m_iRowLastCrossed );
 	}
 
+
+	// reload noteskin if it has changed
+	if( m_sLastSeenNoteSkin != GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin )
+	{
+		m_NoteField.ReloadNoteSkin();
+		m_sLastSeenNoteSkin = GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin;
+	}
+
+
 	ActorFrame::Update( fDeltaTime );
 }
 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 249da61094..93e9b71f5d 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -238,8 +238,9 @@ ScreenEdit::ScreenEdit() : Screen("ScreenEdit")
 
 	GAMESTATE->m_PlayerOptions[PLAYER_1].m_fScrollSpeed = 1;
 	GAMESTATE->m_SongOptions.m_fMusicRate = 1;
-	/* Err, not all games have a noteskin named "note" ... */
-//	GAMESTATE->m_PlayerOptions[PLAYER_1].m_sNoteSkin = "note";	// change noteskin before loading all of the edit Actors
+	/* Not all games have a noteskin named "note" ... */
+	if( NOTESKIN->DoesNoteSkinExist("note") )
+		GAMESTATE->m_PlayerOptions[PLAYER_1].m_sNoteSkin = "note";	// change noteskin before loading all of the edit Actors
 
 	m_BGAnimation.LoadFromAniDir( THEME->GetPathToB("ScreenEdit background") );