diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 0a97e051..fd82d852 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1085,7 +1085,7 @@ namespace SourceGit.Views
                     return;
                 }
 
-                var top = chunk.Y + 16;
+                var top = chunk.Y + (chunk.Height >= 36 ? 16 : 4);
                 var right = (chunk.Combined || !chunk.IsOldSide) ? 16 : v.Bounds.Width * 0.5f + 16;
                 v.Popup.Margin = new Thickness(0, top, right, 0);
                 v.Popup.IsVisible = true;