1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 94041d77bb0..ed2e6a5af58 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -177,7 +177,7 @@ export default class MergeRequestTabs {
     this.peek = document.getElementById('js-peek');
     this.sidebar = document.querySelector('.js-right-sidebar');
     this.pageLayout = document.querySelector('.layout-page');
-    this.expandSidebar = document.querySelector('.js-expand-sidebar');
+    this.expandSidebar = document.querySelectorAll('.js-expand-sidebar, .js-sidebar-toggle');
     this.paddingTop = 16;
 
     this.scrollPositions = {};
@@ -282,7 +282,11 @@ export default class MergeRequestTabs {
       const tab = this.mergeRequestTabs.querySelector(`.${action}-tab`);
       if (tab) tab.classList.add('active');
 
-      this.expandSidebar?.classList.toggle('gl-display-none!', action !== 'show');
+      if (window.gon?.features?.movedMrSidebar) {
+        this.expandSidebar?.forEach((el) =>
+          el.classList.toggle('gl-display-none!', action !== 'show'),
+        );
+      }
 
       if (action === 'commits') {
         this.loadCommits(href);