diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 18c62cb4f1e..b78f11aadf1 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -9,7 +9,7 @@
     @media (min-width: map-get($grid-breakpoints, md)) {
       position: -webkit-sticky;
       position: sticky;
-      top: 92px;
+      top: $header-height + 51px;
       margin-left: -1px;
       border-left: 1px solid $border-color;
       z-index: 102;
diff --git a/changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml b/changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml
new file mode 100644
index 00000000000..ce8e1829b48
--- /dev/null
+++ b/changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml
@@ -0,0 +1,5 @@
+---
+title: Remove extra space between MR tab bar and sticky file headers
+merge_request:
+author:
+type: fixed