diff --git a/stepmania/src/ScreenGameplayMultiplayer.cpp b/stepmania/src/ScreenGameplayMultiplayer.cpp
index 5b937c3cc6..e314a6581e 100644
--- a/stepmania/src/ScreenGameplayMultiplayer.cpp
+++ b/stepmania/src/ScreenGameplayMultiplayer.cpp
@@ -23,13 +23,6 @@
 #include "ActorUtil.h"
 #include "PrefsManager.h"
 
-//
-// Defines
-//
-#define PREV_SCREEN								THEME->GetMetric (m_sName,"PrevScreen")
-#define NEXT_SCREEN								THEME->GetMetric (m_sName,"NextScreen")
-
-
 // received while STATE_DANCING
 AutoScreenMessage( SM_NotesEnded )
 AutoScreenMessage( SM_Ready )
@@ -611,14 +604,16 @@ void ScreenGameplayMultiplayer::HandleScreenMessage( const ScreenMessage SM )
 		GAMESTATE->CancelStage();
 
 		SCREENMAN->DeletePreparedScreens();
-		SCREENMAN->SetNewScreen( PREV_SCREEN );
+		SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
 	}
 	else if( SM == SM_GoToStateAfterCleared )
 	{
 		StageFinished( false );
 
-		SCREENMAN->SetNewScreen( NEXT_SCREEN );
+		SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
 	}
+
+	Screen::HandleScreenMessage( SM );
 }
 
 
diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp
index e2b6b6cd34..573650145d 100644
--- a/stepmania/src/ScreenReloadSongs.cpp
+++ b/stepmania/src/ScreenReloadSongs.cpp
@@ -2,7 +2,6 @@
 #include "ScreenReloadSongs.h"
 #include "SongManager.h"
 #include "UnlockManager.h"
-#include "ScreenManager.h"
 #include "RageTimer.h"
 #include "RageLog.h"
 #include "ThemeManager.h"
@@ -10,8 +9,6 @@
 
 #include "arch/LoadingWindow/LoadingWindow.h"
 
-#define NEXT_SCREEN							THEME->GetMetric (m_sName,"NextScreen")
-
 static const int DrawFrameRate = 20;
 class ScreenReloadSongsLoadingWindow: public LoadingWindow
 {
@@ -82,7 +79,8 @@ void ScreenReloadSongs::Update( float fDeltaTime )
 
 	SONGMAN->Reload( m_LoadingWindow );
 	UNLOCKMAN->UpdateCachedPointers();
-	SCREENMAN->SetNewScreen( NEXT_SCREEN );
+
+	SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
 }
 
 /*
diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp
index b43ba57637..ca4c0f09ed 100644
--- a/stepmania/src/ScreenSMOnlineLogin.cpp
+++ b/stepmania/src/ScreenSMOnlineLogin.cpp
@@ -15,9 +15,6 @@
 
 REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
 
-#define PREV_SCREEN		THEME->GetMetric (m_sName,"PrevScreen")
-#define NEXT_SCREEN		THEME->GetMetric (m_sName,"NextScreen")
-
 AutoScreenMessage( SM_SMOnlinePack )
 AutoScreenMessage( SM_PasswordDone )
 
@@ -102,7 +99,7 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 		if(!ScreenTextEntry::s_bCancelledLast)
 			SendLogin(ScreenTextEntry::s_sLastAnswer);
 		else
-			SCREENMAN->SetNewScreen(PREV_SCREEN);
+			SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
 	}
 	else if( SM == SM_SMOnlinePack )
 	{
@@ -117,7 +114,7 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 				if( GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer) && m_iPlayer < NUM_PLAYERS )
 					ScreenTextEntry::Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter your password.", NULL );
 				else
-					SCREENMAN->SetNewScreen(NEXT_SCREEN);
+					SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
 			}
 			else
 			{
@@ -156,7 +153,7 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 	}
 	else if( SM == SM_GoToPrevScreen )
 	{
-		SCREENMAN->SetNewScreen(PREV_SCREEN);
+		SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
 		return;
 	}