diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index f1f1c41709..0f291d2f60 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -126,11 +126,11 @@ void ScreenMapControllers::Init()
 
 	// exit row
 	{
-		m_pExit = ActorUtil::MakeActor( THEME->GetPathG(m_sName,"exit") );
-		m_pExit->SetName( "Exit" );
-		ActorUtil::LoadAllCommands( *m_pExit, m_sName );
+		m_sprExit.Load( THEME->GetPathG(m_sName,"exit") );
+		m_sprExit->SetName( "Exit" );
+		ActorUtil::LoadAllCommands( *m_sprExit, m_sName );
 
-		m_Line[iRow].AddChild( m_pExit );
+		m_Line[iRow].AddChild( m_sprExit );
 		m_LineScroller.AddChild( &m_Line[iRow] );
 
 		iRow++;
@@ -408,7 +408,7 @@ void ScreenMapControllers::TweenOffScreen()
 Actor *ScreenMapControllers::GetActorWithFocus()
 {
 	if( m_iCurButton == (int) m_KeysToMap.size() )
-		return m_pExit;
+		return m_sprExit;
 
 	const KeyToMap *pKey = &m_KeysToMap[m_iCurButton];
 	return pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
diff --git a/stepmania/src/ScreenMapControllers.h b/stepmania/src/ScreenMapControllers.h
index f67747600a..b0b45a0826 100644
--- a/stepmania/src/ScreenMapControllers.h
+++ b/stepmania/src/ScreenMapControllers.h
@@ -47,8 +47,7 @@ private:
 
 	BitmapText m_textLabel[MAX_GAME_CONTROLLERS];
 
-	// owned by m_Line
-	Actor *m_pExit;
+	AutoActor m_sprExit;
 
 	ActorFrame	m_Line[MAX_GAME_BUTTONS+2]; // label, normal lines, exit
 	ActorScroller m_LineScroller;