diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 04b908a62d..745186b4b8 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2252,9 +2252,9 @@ Class=ScreenSystemLayer
 StatsX=SCREEN_RIGHT-8
 StatsY=SCREEN_TOP+10
 StatsOnCommand=horizalign,right;vertalign,top;zoom,0.5;shadowlength,2
-MessageX=SCREEN_LEFT+4
-MessageY=SCREEN_TOP+4
-MessageOnCommand=horizalign,left;vertalign,top;zoom,0.8;shadowlength,2
+MessageX=0
+MessageY=0
+MessageOnCommand=finishtweening;horizalign,left;vertalign,top;x,SCREEN_LEFT+4;y,SCREEN_TOP+4;zoom,0.8;shadowlength,2;diffusealpha,1;x,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH;sleep,5;linear,0.5;diffusealpha,0
 TimeX=SCREEN_LEFT+4
 TimeY=SCREEN_TOP+40
 TimeOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0;diffuse,1,0,1,1
diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp
index 21b9b8c279..dd48471ed4 100644
--- a/stepmania/src/ScreenSystemLayer.cpp
+++ b/stepmania/src/ScreenSystemLayer.cpp
@@ -92,7 +92,8 @@ void ScreenSystemLayer::ReloadCreditsText()
 {
 	m_textMessage.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","message") );
 	m_textMessage.SetName( "Message" );
-	SET_XY_AND_ON_COMMAND( m_textMessage ); 
+	SET_XY_AND_ON_COMMAND( m_textMessage );
+	m_textMessage.SetHidden( true );
 
  	m_textStats.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","stats") );
 	m_textStats.SetName( "Stats" );
@@ -218,19 +219,16 @@ void ScreenSystemLayer::HandleMessage( const CString &sMessage )
 	}
 	else if( sMessage == "SystemMessage" )
 	{
+		m_textMessage.SetHidden( false );
 		m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
-		ActorCommands c = ActorCommands( "finishtweening;diffusealpha,1;addx,-640;linear,0.5;addx,+640;sleep,5;linear,0.5;diffusealpha,0" );
-		m_textMessage.RunCommands( c );
+		m_textMessage.PlayCommand( "On" );
 	}
 	else if( sMessage == "SystemMessageNoAnimate" )
 	{
-		m_textMessage.FinishTweening();
+		m_textMessage.SetHidden( false );
 		m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
-		m_textMessage.SetX( 4 );
-		m_textMessage.SetDiffuseAlpha( 1 );
-		m_textMessage.BeginTweening( 5 );
-		m_textMessage.BeginTweening( 0.5f );
-		m_textMessage.SetDiffuse( RageColor(1,1,1,0) );
+		m_textMessage.PlayCommand( "On" );
+		m_textMessage.FinishTweening();
 	}
 	Screen::HandleMessage( sMessage );
 }
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index ebb8ca2d61..8f82bc5b03 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1295,7 +1295,7 @@ bool HandleGlobalInputs( DeviceInput DeviceI, InputEventType type, GameInput Gam
 		if( !GAMESTATE->m_bIsOnSystemMenu )
 		{
 			SCREENMAN->DeletePreparedScreens();
-			SCREENMAN->SystemMessage( "OPERATOR" );
+			SCREENMAN->SystemMessage( "Service switch pressed" );
 			GAMESTATE->Reset();
 			SCREENMAN->SetNewScreen( "ScreenOptionsMenu" );
 		}