diff --git a/src/Views/Widgets/DiffViewer.xaml.cs b/src/Views/Widgets/DiffViewer.xaml.cs
index 33871fff..0bb091ec 100644
--- a/src/Views/Widgets/DiffViewer.xaml.cs
+++ b/src/Views/Widgets/DiffViewer.xaml.cs
@@ -69,7 +69,9 @@ namespace SourceGit.Views.Widgets {
                     if (wcFileID == lastWCFileId) return;
                     lastWCFileId = wcFileID;
                 } else {
-                    lastWCFileId = "";
+                    var wcFileID = string.Format("{0}@-1", opt.Path);
+                    if (wcFileID == lastWCFileId) return;
+                    lastWCFileId = wcFileID;
                 }
             } else {
                 lastWCFileId = "";