diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index c5c4f83123..68b0684c78 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -639,10 +639,10 @@ void ScreenGameplay::Update( float fDeltaTime )
 		//
 		// Check for end of song
 		//
-		if( fSongBeat > GAMESTATE->m_pCurSong->m_fLastBeat+1  &&  !m_soundMusic.IsPlaying() )
+		float fSecondsToStop = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( GAMESTATE->m_pCurSong->m_fLastBeat ) + 1;
+		if( GAMESTATE->m_fMusicSeconds > fSecondsToStop  &&  !m_OniFade.IsClosing() )
 		{
 			GAMESTATE->m_fSongBeat = 0;
-			m_soundMusic.Stop();
 			this->SendScreenMessage( SM_NotesEnded, 0 );
 		}
 
diff --git a/stepmania/src/TransitionOniFade.cpp b/stepmania/src/TransitionOniFade.cpp
index db76a2b787..e8669165f8 100644
--- a/stepmania/src/TransitionOniFade.cpp
+++ b/stepmania/src/TransitionOniFade.cpp
@@ -63,28 +63,28 @@ void TransitionOniFade::DrawPrimitives()
 
 void TransitionOniFade::OpenWipingRight( ScreenMessage send_when_done )
 {
-	SetTransitionTime( 4 );
+	SetTransitionTime( 2.5f );
 	Transition::OpenWipingRight( send_when_done );
 	UpdateSongText();
 }
 
 void TransitionOniFade::OpenWipingLeft(  ScreenMessage send_when_done )
 {
-	SetTransitionTime( 4 );
+	SetTransitionTime( 2.5f );
 	Transition::OpenWipingLeft( send_when_done );
 	UpdateSongText();
 }
 
 void TransitionOniFade::CloseWipingRight(ScreenMessage send_when_done )
 {
-	SetTransitionTime( 2 );
+	SetTransitionTime( 1 );
 	Transition::CloseWipingRight( send_when_done );
 	UpdateSongText();
 }
 
 void TransitionOniFade::CloseWipingLeft( ScreenMessage send_when_done )
 {
-	SetTransitionTime( 2 );
+	SetTransitionTime( 1 );
 	Transition::CloseWipingLeft( send_when_done );
 	UpdateSongText();
 }