diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 4eca9de6..e904f4a4 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -36,7 +36,7 @@
           <StackPanel Grid.Column="3" Margin="8,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
             <Button Classes="icon_button"
                     Width="28"
-                    Command="{Binding PrevChange}"
+                    Click="OnGotoPrevChange"
                     IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.Prev}">
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
@@ -51,7 +51,7 @@
 
             <Button Classes="icon_button"
                     Width="28"
-                    Command="{Binding NextChange}"
+                    Click="OnGotoNextChange"
                     IsVisible="{Binding IsTextDiff}"
                     ToolTip.Tip="{DynamicResource Text.Diff.Next}">
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index 7184ec44..7f7c91f2 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -11,30 +11,48 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
+        public bool UseChangeBlocks { get; set; } = true;
+
         private void OnGotoPrevChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (textDiff == null)
-                return;
+            if (UseChangeBlocks)
+            {
+                if (DataContext is ViewModels.DiffContext diffCtx)
+                    diffCtx.PrevChange();
+            }
+            else
+            {
+                var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
+                if (textDiff == null)
+                    return;
 
-            textDiff.GotoPrevChange();
-            if (textDiff is SingleSideTextDiffPresenter presenter)
-                presenter.ForceSyncScrollOffset();
+                textDiff.GotoPrevChange();
+                if (textDiff is SingleSideTextDiffPresenter presenter)
+                    presenter.ForceSyncScrollOffset();
 
-            e.Handled = true;
+                e.Handled = true;
+            }
         }
 
         private void OnGotoNextChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (textDiff == null)
-                return;
+            if (UseChangeBlocks)
+            {
+                if (DataContext is ViewModels.DiffContext diffCtx)
+                    diffCtx.NextChange();
+            }
+            else
+            {
+                var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
+                if (textDiff == null)
+                    return;
 
-            textDiff.GotoNextChange();
-            if (textDiff is SingleSideTextDiffPresenter presenter)
-                presenter.ForceSyncScrollOffset();
+                textDiff.GotoNextChange();
+                if (textDiff is SingleSideTextDiffPresenter presenter)
+                    presenter.ForceSyncScrollOffset();
 
-            e.Handled = true;
+                e.Handled = true;
+            }
         }
     }
 }