diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 2537756a59..1dbf18fdfe 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3922,13 +3922,13 @@ namespace BizHawk.Client.EmuHawk
 			StopAv();
 
 			CommitCoreSettingsToConfig();
+			Rewinder.Uninitialize();
+
 			if (MovieSession.Movie.IsActive()) // Note: this must be called after CommitCoreSettingsToConfig()
 			{
 				StopMovie();
 			}
 
-			Rewinder.Uninitialize();
-
 			if (Tools.IsLoaded<TraceLogger>())
 			{
 				Tools.Get<TraceLogger>().Restart();