diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 59055dd7cd..4bcc57811a 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -563,12 +563,10 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
 	}
 
 
-	m_sprStageFrame.SetName( "StageFrame" );
 	m_sprStageFrame.Load( THEME->GetPathToG("ScreenGameplay stage frame") );
+	m_sprStageFrame->SetName( "StageFrame" );
 	SET_XY( m_sprStageFrame );
-	/* Show in course mode and regular play, but not demo.  (This will go away eventually.) */
-	if( !bDemonstration )
-		this->AddChild( &m_sprStageFrame );
+	this->AddChild( m_sprStageFrame );
 
 	//
 	// Player/Song options
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index ad053b3ac9..db69609b15 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -115,7 +115,7 @@ protected:
 	CombinedLifeMeter*	m_pCombinedLifeMeter;
 	Sprite				m_sprStage;
 	Sprite				m_sprCourseSongNumber;
-	Sprite				m_sprStageFrame;
+	AutoActor			m_sprStageFrame;
 	BitmapText			m_textCourseSongNumber[NUM_PLAYERS];
 	BitmapText			m_textPlayerName[NUM_PLAYERS];
 	BitmapText			m_textStepsDescription[NUM_PLAYERS];