diff --git a/src/movie.cpp b/src/movie.cpp
index 759bc2e1..270b7393 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -588,15 +588,7 @@ void FCEUMOV_AddJoy(uint8 *js, int SkipFlush)
 		//stop when we run out of frames
 		if(currFrameCounter == currMovieData.records.size())
 		{
-			
-			if(FCEUD_PauseAfterPlayback())
-			{
-				FCEUI_ToggleEmulationPause();
-				FCEU_DispMessage("Paused after playback");
-			} 
-			else
-				StopPlayback();
-		}
+			StopPlayback();
 		}
 		else
 		{
@@ -605,6 +597,15 @@ void FCEUMOV_AddJoy(uint8 *js, int SkipFlush)
 				js[i] = mr.joysticks[i];
 		}
 
+		//if we are on the last frame, then pause the emulator if the player requested it
+		if(currFrameCounter == currMovieData.records.size()-1)
+		{
+			if(FCEUD_PauseAfterPlayback())
+			{
+				FCEUI_ToggleEmulationPause();
+			}
+		}
+
 		//pause the movie at a specified frame 
 		if(FCEUMOV_ShouldPause() && FCEUI_EmulationPaused()==0)
 		{