diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 5dc63b4a5c..9974976846 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -161,7 +161,14 @@ namespace BizHawk.Client.Common
 					Movie.SwitchToRecord();
 					break;
 				case MovieEndAction.Pause:
-					PauseCallback(); // TODO: one frame ago
+					if (Global.Emulator.Frame >= Movie.InputLogLength)
+					{
+						Movie.Stop();
+					}
+					else
+					{
+						PauseCallback();
+					}
 					break;
 				default:
 				case MovieEndAction.Finish: