diff --git a/src/HexManiac.Core/Models/ModelDelta.cs b/src/HexManiac.Core/Models/ModelDelta.cs
index ca5e1ca2..cb4a9ac8 100644
--- a/src/HexManiac.Core/Models/ModelDelta.cs
+++ b/src/HexManiac.Core/Models/ModelDelta.cs
@@ -241,7 +241,6 @@ namespace HavenSoft.HexManiac.Core.Models {
       }
 
       private IDisposable CaptureNonDataChange() {
-         var initialState = HasAnyChange;
          if (HasAnyChange) return new StubDisposable();
          return new StubDisposable { Dispose = () => {
             if (!HasAnyChange) return;
diff --git a/src/HexManiac.Core/ViewModels/ChangeHistory.cs b/src/HexManiac.Core/ViewModels/ChangeHistory.cs
index d807de17..1b3dc860 100644
--- a/src/HexManiac.Core/ViewModels/ChangeHistory.cs
+++ b/src/HexManiac.Core/ViewModels/ChangeHistory.cs
@@ -160,8 +160,9 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
          var hasDataChange = HasDataChange;
          if (hasDataChange != hasDataChangeCache) {
             hasDataChangeCache = hasDataChange;
-            NotifyPropertyChanged(nameof(HasDataChange));
+            NotifyPropertyChanged(nameof(HasDataChange), nameof(IsSaved));
          }
+         if (!hasDataChange && currentChange.HasAnyChange) NotifyPropertyChanged(nameof(IsSaved));
       }
 
       private void UndoExecuted() {