diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index d0ca1c28ce..f590e4c15f 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -139,6 +139,7 @@ namespace BizHawk.Client.Common
 				{
 					var succeed = false;
 
+					// Movie timeline check must happen before the core state is loaded
 					if (Global.MovieSession.Movie.IsActive())
 					{
 						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.CheckSavestateTimeline(tr));
@@ -146,12 +147,6 @@ namespace BizHawk.Client.Common
 						{
 							return false;
 						}
-
-						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
-						if (!succeed)
-						{
-							return false;
-						}
 					}
 
 					using (new SimpleTime("Load Core"))
@@ -159,6 +154,16 @@ namespace BizHawk.Client.Common
 						bl.GetCoreState(br => core.LoadStateBinary(br), tr => core.LoadStateText(tr));
 					}
 
+					// We must handle movie input AFTER the core is loaded to properly handle mode changes, and input latching
+					if (Global.MovieSession.Movie.IsActive())
+					{
+						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
+						if (!succeed)
+						{
+							return false;
+						}
+					}
+
 					bl.GetLump(BinaryStateLump.Framebuffer, false, PopulateFramebuffer);
 
 					string userData = "";
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 47f63f09b7..d6d636252d 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -343,6 +343,10 @@ namespace BizHawk.Client.Common
 				{
 					Movie.SwitchToPlay();
 				}
+				else if (Movie.IsPlaying())
+				{
+					LatchInputFromLog();
+				}
 				else if (Movie.IsFinished())
 				{
 					LatchInputFromPlayer(Global.MovieInputSourceAdapter);