diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp
index 31f7325189..a13bb55927 100644
--- a/stepmania/src/ScreenNetRoom.cpp
+++ b/stepmania/src/ScreenNetRoom.cpp
@@ -58,7 +58,7 @@ void ScreenNetRoom::Init()
 	m_RoomWheel.Load("RoomWheel");
 	m_RoomWheel.SetName( "RoomWheel" );
 	SET_XY( m_RoomWheel );
-	m_RoomWheel.TweenOnScreen();
+	ON_COMMAND( m_RoomWheel );
 	m_RoomWheel.SetDrawOrder(1);
 	this->AddChild( &m_RoomWheel );
 	this->MoveToHead( &m_RoomWheel );
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 0e9c47f4cb..233c853321 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -76,8 +76,8 @@ void ScreenNetSelectMusic::Init()
 	m_MusicWheel.Load( "MusicWheel" );
 	m_MusicWheel.SetName( "MusicWheel" );
 	SET_XY( m_MusicWheel );
-	m_MusicWheel.TweenOnScreen();
 	m_MusicWheel.BeginScreen();
+	ON_COMMAND( m_MusicWheel );
 	this->AddChild( &m_MusicWheel );
 	this->MoveToHead( &m_MusicWheel );
 
@@ -458,7 +458,6 @@ void ScreenNetSelectMusic::TweenOffScreen()
 		OFF_COMMAND( m_OptionIconRow[pn] );
 	}
 
-	m_MusicWheel.TweenOffScreen();
 	OFF_COMMAND( m_MusicWheel );
 
 	NSMAN->ReportNSSOnOff(0);