diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index e3b44ad7b3..57ebbfbd1d 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -34,7 +34,6 @@
 #define ATTACK_ICONS_OFF_COMMAND( p )		THEME->GetMetricA("ScreenSelectCharacter",ssprintf("AttackIconsP%dOffCommand",p+1))
 #define HELP_TEXT							THEME->GetMetric ("ScreenSelectCharacter","HelpText")
 #define TIMER_SECONDS						THEME->GetMetricI("ScreenSelectCharacter","TimerSeconds")
-#define SLEEP_AFTER_TWEEN_OFF_SECONDS		THEME->GetMetricF("ScreenSelectCharacter","SleepAfterTweenOffSeconds")
 #define ICON_WIDTH							THEME->GetMetricF("ScreenSelectCharacter","IconWidth")
 #define ICON_HEIGHT							THEME->GetMetricF("ScreenSelectCharacter","IconHeight")
 #define ICONS_ON_COMMAND( p )				THEME->GetMetricA("ScreenSelectCharacter",ssprintf("IconsP%dOnCommand",p+1))
@@ -357,8 +356,7 @@ void ScreenSelectCharacter::MenuStart( PlayerNumber pn )
 		}
 
 		StopTimer();
-		TweenOursOffScreen();
-		this->PostScreenMessage( SM_BeginFadingOut, SLEEP_AFTER_TWEEN_OFF_SECONDS );
+		this->PostScreenMessage( SM_BeginFadingOut, 0 );
 	}
 }
 
@@ -367,8 +365,10 @@ void ScreenSelectCharacter::MenuBack( PlayerNumber pn )
 	Cancel( SM_GoToPrevScreen );
 }
 
-void ScreenSelectCharacter::TweenOursOffScreen()
+void ScreenSelectCharacter::TweenOffScreen()
 {
+	ScreenWithMenuElements::TweenOffScreen();
+
 	FOREACH_PlayerNumber( p )
 	{
 		m_sprCard[p].RunCommands( CARD_OFF_COMMAND(p) );
diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h
index 6811a8c081..ae3f47becb 100644
--- a/stepmania/src/ScreenSelectCharacter.h
+++ b/stepmania/src/ScreenSelectCharacter.h
@@ -30,7 +30,7 @@ public:
 	void MenuStart( PlayerNumber pn );
 	void MenuBack( PlayerNumber pn );
 
-	void TweenOursOffScreen();
+	void TweenOffScreen();
 
 private:
 	// These functions take the PlayerNumber of the player making the selections,
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 0feed27990..0685ebdcdc 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -19,7 +19,6 @@
 
 #define BANNER_WIDTH					THEME->GetMetricF("ScreenSelectGroup","BannerWidth")
 #define BANNER_HEIGHT					THEME->GetMetricF("ScreenSelectGroup","BannerHeight")
-#define SLEEP_AFTER_TWEEN_OFF_SECONDS	THEME->GetMetricF("ScreenSelectGroup","SleepAfterTweenOffSeconds")
 
 
 REGISTER_SCREEN_CLASS( ScreenSelectGroup );
@@ -226,9 +225,7 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn )
 	else
         SOUND->PlayOnceFromAnnouncer( "select group comment general" );
 
-
-	TweenOursOffScreen();
-	this->PostScreenMessage( SM_BeginFadingOut, SLEEP_AFTER_TWEEN_OFF_SECONDS );
+	this->PostScreenMessage( SM_BeginFadingOut, 0 );
 }
 
 void ScreenSelectGroup::MenuBack( PlayerNumber pn )
@@ -236,8 +233,10 @@ void ScreenSelectGroup::MenuBack( PlayerNumber pn )
 	Cancel( SM_GoToPrevScreen );
 }
 
-void ScreenSelectGroup::TweenOursOffScreen()
+void ScreenSelectGroup::TweenOffScreen()
 {
+	ScreenWithMenuElements::TweenOffScreen();
+
 	OFF_COMMAND( m_sprExplanation );
 	OFF_COMMAND( m_sprFrame );
 	OFF_COMMAND( m_Banner );
diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h
index 550cc39b44..0e00e26647 100644
--- a/stepmania/src/ScreenSelectGroup.h
+++ b/stepmania/src/ScreenSelectGroup.h
@@ -30,7 +30,7 @@ public:
 	void MenuBack( PlayerNumber pn );
 
 	void TweenOursOnScreen();
-	void TweenOursOffScreen();
+	void TweenOffScreen();
 
 private: