diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js
index 7298a7d5347ef1d7323e2096e347877249cb2fb0..64a68d5696247d3f298be8c2eea349661f540fae 100644
--- a/app/assets/javascripts/right_sidebar.js
+++ b/app/assets/javascripts/right_sidebar.js
@@ -200,7 +200,7 @@ import Cookies from 'js-cookie';
     Sidebar.prototype.setSidebarHeight = function() {
       const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
       const $rightSidebar = $('.js-right-sidebar');
-      const diff = $navHeight - $('body').scrollTop();
+      const diff = $navHeight - $(window).scrollTop();
       if (diff > 0) {
         $rightSidebar.outerHeight($(window).height() - diff);
       } else {