diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 9672110e..3969c1b7 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -755,7 +755,7 @@ namespace SourceGit.Views
             }
             else if (change.Property == SyncScrollOffsetProperty)
             {
-                if (_scrollViewer != null)
+                if (!TextArea.IsFocused && _scrollViewer != null)
                     _scrollViewer.Offset = SyncScrollOffset;
             }
             else if (change.Property == UseSyntaxHighlightingProperty)