diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 1f6d3cef5f..945084f388 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -514,14 +514,6 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
 		}
 		this->HandleScreenMessage( SM_GoToNextScreen );
 	}
-	else if( SM == SM_GoToNextScreen )
-	{
-		this->GoToNextScreen();
-	}
-	else if( SM == SM_GoToPrevScreen )
-	{
-		this->GoToPrevScreen();
-	}
 	else if( SM == SM_BeginFadingOut )
 	{
 		if(IsTransitioning())
@@ -540,6 +532,8 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
 	{
 		INPUTFILTER->ResetRepeatRate();
 	}
+
+	ScreenWithMenuElements::HandleScreenMessage( SM );
 }
 
 
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 9d6baff5aa..41f2b5ad01 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -60,8 +60,6 @@ protected:
 	virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
 
 	virtual void BeginFadingOut() { this->PostScreenMessage( SM_BeginFadingOut, 0 ); }
-	virtual void GoToNextScreen() { }
-	virtual void GoToPrevScreen() { }
 
 	void ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat );
 	virtual void AfterChangeValueInRow( PlayerNumber pn ) {}	// override this to detect when the value in a row has changed