diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 1e4fe18a5c..449a9b8b26 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -4147,7 +4147,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			if (MovieSession.Movie.IsFinished())
+			if (Emulator.Frame > MovieSession.Movie.FrameCount)
 			{
 				OSD.AddMessage("Cannot savestate after movie end!");
 				return;