diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index daa02930b2..0aa2f017be 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2210,7 +2210,8 @@ void ScreenEdit::TransitionEditState( EditState em )
 
 		/* If we're in course display mode, set that up. */
 		SetupCourseAttacks();
-
+		
+		m_Player->CacheAllUsedNoteSkins();
 		m_Player.Load( m_NoteDataEdit );
 		GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PREFSMAN->m_AutoPlay;