diff --git a/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/BizHawk.Client.EmuHawk/config/RewindConfig.cs
index 2a323b80e0..cc015a1688 100644
--- a/BizHawk.Client.EmuHawk/config/RewindConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/RewindConfig.cs
@@ -14,6 +14,7 @@ namespace BizHawk.Client.EmuHawk
 		private int _mediumStateSize;
 		private int _largeStateSize;
 		private int _stateSizeCategory = 1; //1 = small, 2 = med, 3 = larg //TODO: enum
+
 		public RewindConfig()
 		{
 			InitializeComponent();
@@ -138,38 +139,45 @@ namespace BizHawk.Client.EmuHawk
 			Close();
 		}
 
+		private bool TriggerRewindSettingsReload { get; set; }
+
+		private void PutRewindSetting<T>(ref T setting, T value) where T : IEquatable<T>
+		{
+			if (setting.Equals(value)) return;
+			setting = value;
+			TriggerRewindSettingsReload = true;
+		}
+
 		private void OK_Click(object sender, EventArgs e)
 		{
-			Global.Config.RewindFrequencySmall = (int)SmallSavestateNumeric.Value;
-			Global.Config.RewindFrequencyMedium = (int)MediumSavestateNumeric.Value;
-			Global.Config.RewindFrequencyLarge = (int)LargeSavestateNumeric.Value;
+			// These settings are used by DoRewindSettings, which we'll only call if anything actually changed (i.e. preserve rewind history if possible)
+			PutRewindSetting(ref Global.Config.RewindEnabledSmall, SmallStateEnabledBox.Checked);
+			PutRewindSetting(ref Global.Config.RewindEnabledMedium, MediumStateEnabledBox.Checked);
+			PutRewindSetting(ref Global.Config.RewindEnabledLarge, LargeStateEnabledBox.Checked);
+			PutRewindSetting(ref Global.Config.RewindFrequencySmall, (int)SmallSavestateNumeric.Value);
+			PutRewindSetting(ref Global.Config.RewindFrequencyMedium, (int)MediumSavestateNumeric.Value);
+			PutRewindSetting(ref Global.Config.RewindFrequencyLarge, (int)LargeSavestateNumeric.Value);
+			PutRewindSetting(ref Global.Config.Rewind_OnDisk, DiskBufferCheckbox.Checked);
+			PutRewindSetting(ref Global.Config.Rewind_UseDelta, UseDeltaCompression.Checked);
+			PutRewindSetting(ref Global.Config.Rewind_IsThreaded, RewindIsThreadedCheckbox.Checked);
+			PutRewindSetting(ref Global.Config.Rewind_BufferSize, (int)BufferSizeUpDown.Value);
+			PutRewindSetting(ref Global.Config.Rewind_MediumStateSize, (int)MediumStateUpDown.Value * 1024);
+			PutRewindSetting(ref Global.Config.Rewind_LargeStateSize, (int)LargeStateUpDown.Value * 1024);
+			if (TriggerRewindSettingsReload)
+			{
+				Global.Rewinder.DoRewindSettings();
+			}
 
-			Global.Config.RewindEnabledSmall = SmallStateEnabledBox.Checked;
-			Global.Config.RewindEnabledMedium = MediumStateEnabledBox.Checked;
-			Global.Config.RewindEnabledLarge = LargeStateEnabledBox.Checked;
-			Global.Rewinder.DoRewindSettings();
+			// These settings are not used by DoRewindSettings
 			Global.Config.RewindSpeedMultiplier = (int)RewindSpeedNumeric.Value;
-			Global.Config.Rewind_UseDelta = UseDeltaCompression.Checked;
-			Global.Config.Rewind_MediumStateSize = (int)(MediumStateUpDown.Value * 1024);
-			Global.Config.Rewind_LargeStateSize = (int)(LargeStateUpDown.Value * 1024);
-			Global.Config.Rewind_OnDisk = DiskBufferCheckbox.Checked;
-			Global.Config.Rewind_BufferSize = (int)BufferSizeUpDown.Value;
 			Global.Config.SaveStateCompressionLevelNormal = (int)nudCompression.Value;
-
 			if (rbStatesDefault.Checked) Global.Config.SaveStateType = Config.SaveStateTypeE.Default;
 			if (rbStatesBinary.Checked) Global.Config.SaveStateType = Config.SaveStateTypeE.Binary;
 			if (rbStatesText.Checked) Global.Config.SaveStateType = Config.SaveStateTypeE.Text;
-
-			if (Global.Config.Rewind_IsThreaded != RewindIsThreadedCheckbox.Checked)
-			{
-				GlobalWin.MainForm.FlagNeedsReboot();
-				Global.Config.Rewind_IsThreaded = RewindIsThreadedCheckbox.Checked;
-			}
-
 			Global.Config.BackupSavestates = BackupSavestatesCheckbox.Checked;
 			Global.Config.SaveScreenshotWithStates = ScreenshotInStatesCheckbox.Checked;
 			Global.Config.SaveLargeScreenshotWithStates = SaveLargeScreenshotsCheckbox.Checked;
-			Global.Config.BigScreenshotSize = (int)(BigScreenshotNumeric.Value * 1024);
+			Global.Config.BigScreenshotSize = (int)BigScreenshotNumeric.Value * 1024;
 
 			GlobalWin.OSD.AddMessage("Rewind and State settings saved");
 			Close();