diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 236f11014e..47be1bf598 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -14,9 +14,6 @@
 #include "PlayerState.h"
 #include "Foreach.h"
 
-#define PREV_SCREEN				THEME->GetMetric ("ScreenPlayerOptions","PrevScreen")
-#define NEXT_SCREEN				THEME->GetMetric ("ScreenPlayerOptions","NextScreen")
-
 REGISTER_SCREEN_CLASS( ScreenPlayerOptions );
 ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
 	ScreenOptionsMaster( sClassName )
@@ -149,25 +146,16 @@ void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM )
 		if( SCREENMAN->IsStackedScreen(this) )
 		{
 			SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
+			return;
 		}
-		else
-		{
-			SCREENMAN->SetNewScreen( NEXT_SCREEN );
-		}
-		return;
 	}
 	else if( SM == SM_GoToPrevScreen )
 	{
 		if( SCREENMAN->IsStackedScreen(this) )
 		{
 			SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
+			return;
 		}
-		else
-		{
-			SCREENMAN->DeletePreparedScreens();
-			SCREENMAN->SetNewScreen( PREV_SCREEN );
-		}
-		return;
 	}
 
 	ScreenOptionsMaster::HandleScreenMessage( SM );
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index b07b3e2666..a8568b5693 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -6,9 +6,6 @@
 #include "ThemeManager.h"
 #include "PrefsManager.h"
 
-#define PREV_SCREEN		THEME->GetMetric ("ScreenSongOptions","PrevScreen")
-#define NEXT_SCREEN		THEME->GetMetric ("ScreenSongOptions","NextScreen")
-
 REGISTER_SCREEN_CLASS( ScreenSongOptions );
 ScreenSongOptions::ScreenSongOptions( CString sClassName ) :
 	ScreenOptionsMaster( sClassName )
@@ -44,23 +41,18 @@ void ScreenSongOptions::HandleScreenMessage( const ScreenMessage SM )
 	if( SM == SM_GoToNextScreen )
 	{
 		if( SCREENMAN->IsStackedScreen(this) )
+		{
 			SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
-		else
-			SCREENMAN->SetNewScreen( NEXT_SCREEN );
-		return;
+			return;
+		}
 	}
 	else if( SM == SM_GoToPrevScreen )
 	{
 		if( SCREENMAN->IsStackedScreen(this) )
 		{
 			SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
+			return;
 		}
-		else
-		{
-			SCREENMAN->DeletePreparedScreens();
-			SCREENMAN->SetNewScreen( PREV_SCREEN );
-		}
-		return;
 	}
 
 	ScreenOptionsMaster::HandleScreenMessage( SM );