diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index a87e0bd3..51418baf 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -78,9 +78,15 @@ namespace SourceGit.ViewModels
             if (_content is Models.TextDiff textDiff)
             {
                 if (textDiff.CurrentChangeBlockIdx > 0)
+                {
                     textDiff.CurrentChangeBlockIdx--;
-                else if (textDiff.CurrentChangeBlockIdx == -1 && textDiff.ChangeBlocks.Count > 0)
-                    textDiff.CurrentChangeBlockIdx = 0; // Jump to first change block
+                }
+                else if (textDiff.ChangeBlocks.Count > 0)
+                {
+                    // Force property value change and (re-)jump to first change block
+                    textDiff.CurrentChangeBlockIdx = -1;
+                    textDiff.CurrentChangeBlockIdx = 0;
+                }
             }
         }
 
@@ -89,7 +95,15 @@ namespace SourceGit.ViewModels
             if (_content is Models.TextDiff textDiff)
             {
                 if (textDiff.CurrentChangeBlockIdx < textDiff.ChangeBlocks.Count - 1)
+                {
                     textDiff.CurrentChangeBlockIdx++;
+                }
+                else if (textDiff.ChangeBlocks.Count > 0)
+                {
+                    // Force property value change and (re-)jump to last change block
+                    textDiff.CurrentChangeBlockIdx = -1;
+                    textDiff.CurrentChangeBlockIdx = textDiff.ChangeBlocks.Count - 1;
+                }
             }
         }