diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 471e57a4d6..2782c72739 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1324,6 +1324,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers )
 				LOG->Trace( "Starting playback at %f", fStartSeconds );
 				m_soundMusic.SetPlaybackRate( GAMESTATE->m_SongOptions.m_fMusicRate );
 				m_soundMusic.SetPositionSeconds( fStartSeconds );
+				m_soundMusic.StartPlaying();
 			}
 			break;
 		case record:
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index b29d9bd392..285915932f 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -399,7 +399,8 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 
 	m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","header2") );
 	m_textAutoPlay.SetXY( AUTOPLAY_X, AUTOPLAY_Y );
-	this->AddChild( &m_textAutoPlay );
+	if( !bDemonstration )	// only load if we're not in demonstration of jukebox
+		this->AddChild( &m_textAutoPlay );
 	UpdateAutoPlayText();