diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp
index 82661014c8..40b0fd1d4e 100644
--- a/stepmania/src/ScreenSelectCourse.cpp
+++ b/stepmania/src/ScreenSelectCourse.cpp
@@ -287,8 +287,6 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type,
 
 void ScreenSelectCourse::HandleScreenMessage( const ScreenMessage SM )
 {
-	Screen::HandleScreenMessage( SM );
-
 	switch( SM )
 	{
 	case SM_AllowOptionsMenuRepeat:
@@ -323,6 +321,8 @@ void ScreenSelectCourse::HandleScreenMessage( const ScreenMessage SM )
 		AfterCourseChange();
 		break;
 	}
+
+	Screen::HandleScreenMessage( SM );
 }
 
 void ScreenSelectCourse::MenuStart( PlayerNumber pn )
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 37acdfc59c..d12f1716c5 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -948,8 +948,6 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
 
 void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 {
-	Screen::HandleScreenMessage( SM );
-
 	switch( SM )
 	{
 	case SM_AllowOptionsMenuRepeat:
@@ -1019,6 +1017,8 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		SortOrderChanged();
 		break;
 	}
+
+	Screen::HandleScreenMessage( SM );
 }
 
 void ScreenSelectMusic::MenuStart( PlayerNumber pn )