diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index e6ea493488..adab4eedad 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -15,8 +15,6 @@ REGISTER_SCREEN_CLASS( ScreenTestLights );
 
 void ScreenTestLights::Init()
 {
-	LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_AUTO_CYCLE );
-
 	ScreenWithMenuElements::Init();
 
 	m_textInputs.SetName( "Text" );
@@ -26,7 +24,17 @@ void ScreenTestLights::Init()
 	this->AddChild( &m_textInputs );
 }
 
+void ScreenTestLights::BeginScreen()
+{
+	LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_AUTO_CYCLE );
+	ScreenWithMenuElements::BeginScreen();
+}
 
+void ScreenTestLights::EndScreen()
+{
+	LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
+	ScreenWithMenuElements::EndScreen();
+}
 
 ScreenTestLights::~ScreenTestLights()
 {
@@ -92,14 +100,6 @@ void ScreenTestLights::Input( const InputEventPlus &input )
 	ScreenWithMenuElements::Input( input );	// default handler
 }
 
-void ScreenTestLights::HandleScreenMessage( const ScreenMessage SM )
-{
-	if( SM == SM_LoseFocus )
-		LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
-
-	ScreenWithMenuElements::HandleScreenMessage( SM );
-}
-
 void ScreenTestLights::MenuLeft( const InputEventPlus &input )
 {
 	LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST_MANUAL_CYCLE );
diff --git a/stepmania/src/ScreenTestLights.h b/stepmania/src/ScreenTestLights.h
index 55b2e5a0ba..bf735fe875 100644
--- a/stepmania/src/ScreenTestLights.h
+++ b/stepmania/src/ScreenTestLights.h
@@ -9,11 +9,12 @@ class ScreenTestLights : public ScreenWithMenuElements
 {
 public:
 	virtual void Init();
+	virtual void BeginScreen();
+	virtual void EndScreen();
 	virtual ~ScreenTestLights();
 
 	virtual void Update( float fDelta );
 	virtual void Input( const InputEventPlus &input );
-	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 	virtual void MenuLeft( const InputEventPlus &input );
 	virtual void MenuRight( const InputEventPlus &input );