diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 0d3a695caa..131d41d2c3 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -71,7 +71,7 @@ public:
 	void Init()
 	{
 		ScreenPrompt::Init();
-		this->Load( SM_None, "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO );
+		this->Load( "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO );
 	}
 
 	void End( bool bCancelled )
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 6b4460605f..9e6713cc0c 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -340,7 +340,7 @@ void ScreenNetSelectMusic::MenuUp( PlayerNumber pn, const InputEventType type )
 {
 	NSMAN->ReportNSSOnOff(3);
 	GAMESTATE->m_EditMode = EDIT_MODE_FULL;
-	SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions" );
+	SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromPlayerOptions );
 }
 
 void ScreenNetSelectMusic::MenuDown( PlayerNumber pn, const InputEventType type )
diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index 5c2d461035..9a7ffb28b9 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -19,9 +19,9 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
 	// add the new state onto the back of the array
 	ScreenPrompt *pNewScreen = new ScreenPrompt( "ScreenPrompt" );
 	pNewScreen->Init();
-	pNewScreen->Load( smSendOnPop, sText, type, defaultAnswer, OnYes, OnNo, pCallbackData );
+	pNewScreen->Load( sText, type, defaultAnswer, OnYes, OnNo, pCallbackData );
 	SCREENMAN->ZeroNextUpdate();
-	SCREENMAN->PushScreen( pNewScreen, true );
+	SCREENMAN->PushScreen( pNewScreen, true, smSendOnPop );
 }
 
 
@@ -54,7 +54,6 @@ void ScreenPrompt::Init()
 }
 
 void ScreenPrompt::Load( 
-	ScreenMessage smSendOnPop,
 	CString sText, 
 	PromptType type, 
 	PromptAnswer defaultAnswer, 
@@ -62,7 +61,6 @@ void ScreenPrompt::Load(
 	void (*OnNo)(void*), 
 	void* pCallbackData )
 {
-	m_smSendOnPop = smSendOnPop;
 	m_sText = sText;
 	m_PromptType = type;
 	m_Answer = defaultAnswer;
@@ -116,21 +114,6 @@ void ScreenPrompt::Input( const DeviceInput& DeviceI, const InputEventType type,
 	ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
 
-void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM )
-{
-	switch( SM )
-	{
-	case SM_GoToNextScreen:
-		if( SCREENMAN->IsStackedScreen(this) )
-		{
-			SCREENMAN->PopTopScreen( m_smSendOnPop );
-			return;
-		}
-	}
-
-	ScreenWithMenuElements::HandleScreenMessage( SM );
-}
-
 void ScreenPrompt::Change( int dir )
 {
 	m_textAnswer[m_Answer].SetEffectNone();
diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h
index 9531ee2c86..66193cf3a6 100644
--- a/stepmania/src/ScreenPrompt.h
+++ b/stepmania/src/ScreenPrompt.h
@@ -34,7 +34,6 @@ public:
 	ScreenPrompt( const CString &sScreenName );
 	virtual void Init();
 	void Load( 
-		ScreenMessage smSendOnPop,
 		CString sText, 
 		PromptType type = PROMPT_OK, 
 		PromptAnswer defaultAnswer = ANSWER_NO, 
@@ -43,7 +42,6 @@ public:
 		void* pCallbackData = NULL 
 		);
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
-	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 	static PromptAnswer s_LastAnswer;
 	static bool s_bCancelledLast;
diff --git a/stepmania/src/ScreenSaveSync.cpp b/stepmania/src/ScreenSaveSync.cpp
index 83f5b6c5c7..f1112ea15b 100644
--- a/stepmania/src/ScreenSaveSync.cpp
+++ b/stepmania/src/ScreenSaveSync.cpp
@@ -117,7 +117,6 @@ void ScreenSaveSync::Init()
 	ScreenPrompt::Init();
 
 	Load(
-		SM_None,
 		GetPromptText(), 
 		PROMPT_YES_NO, 
 		ANSWER_YES,