diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index a316bccad6..a88283e1f1 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -672,8 +672,7 @@ void ScreenEdit::Init()
 	m_pPrefsMenu = LoadEditMiniMenu( &g_Prefs );
 	m_pInsertAttackMenu = LoadEditMiniMenu( &g_InsertAttack );
 	m_pCourseModeMenu = LoadEditMiniMenu( &g_CourseMode );
-	m_pScreenPlayerOptions = new ScreenPlayerOptions( "ScreenPlayerOptionsEdit" );
-	m_pScreenPlayerOptions->Init();
+	m_pScreenPlayerOptions = SCREENMAN->MakeNewScreen( "ScreenPlayerOptionsEdit" );
 
 	m_soundMusic.Load( m_pSong->GetMusicPath() );
 
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 35c5c94659..95c1210258 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -18,7 +18,6 @@
 #include "ThemeMetric.h"
 #include "PlayerState.h"
 #include "ScreenMiniMenu.h"
-#include "ScreenPlayerOptions.h"
 
 const int NUM_EDIT_BUTTON_COLUMNS = 10;
 struct MenuDef;
@@ -425,7 +424,7 @@ public:
 	ScreenMiniMenu *m_pPrefsMenu;
 	ScreenMiniMenu *m_pInsertAttackMenu;
 	ScreenMiniMenu *m_pCourseModeMenu;
-	ScreenOptions *m_pScreenPlayerOptions;
+	Screen *m_pScreenPlayerOptions;
 };
 
 #endif