diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp
index 0cc86c0f6a..3bf5b93c49 100644
--- a/stepmania/src/ScreenGameOver.cpp
+++ b/stepmania/src/ScreenGameOver.cpp
@@ -44,6 +44,8 @@ ScreenGameOver::ScreenGameOver()
 	m_sprGameOver.BeginTweeningQueued( 0.5f );		// fade to color
 	m_sprGameOver.SetTweenAddColor( D3DXCOLOR(1,1,1,0) );
 
+	// BUGFIX by ANDY: Stage will now reset back to 0 when game ends.
+	PREFSMAN->m_iCurrentStageIndex = 0;
 
 	this->SendScreenMessage( SM_PlayAnnouncer, 0.5 );
 	this->SendScreenMessage( SM_StartFadingOut, 5 );
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index 7a9c07ea02..69b174f5bd 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -123,6 +123,9 @@ ScreenMusicScroll::ScreenMusicScroll()
 
 	int i;
 
+	// BUGFIX by ANDY: Stage will now reset back to 0 when game ends.
+	PREFSMAN->m_iCurrentStageIndex = 0;
+
 	m_sprBackground.Load( THEME->GetPathTo(GRAPHIC_MUSIC_SCROLL_BACKGROUND) );
 	m_sprBackground.StretchTo( CRect(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) );
 	this->AddActor( &m_sprBackground );
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 265807080b..c13a0b8470 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -67,7 +67,6 @@ ScreenStage::ScreenStage()
 		case 5:	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_STAGE_5) );	break;
 		default:	;	break;	// play nothing
 		}
-		
 	}