1 files changed, 6 insertions, 4 deletions
diff --git a/spec/features/merge_request/user_opens_checkout_branch_modal_spec.rb b/spec/features/merge_request/user_opens_checkout_branch_modal_spec.rb
index 230111fe439..111e8574bac 100644
--- a/spec/features/merge_request/user_opens_checkout_branch_modal_spec.rb
+++ b/spec/features/merge_request/user_opens_checkout_branch_modal_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'Merge request > User opens checkout branch modal', :js, feature_category: :code_review_workflow do
   include ProjectForksHelper
 
-  let_it_be(:user) { create(:user, :no_super_sidebar) }
+  let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public, :repository, namespace: user.namespace) }
 
   before do
@@ -13,7 +13,7 @@ RSpec.describe 'Merge request > User opens checkout branch modal', :js, feature_
   end
 
   describe 'for fork' do
-    let(:author) { create(:user, :no_super_sidebar) }
+    let(:author) { create(:user) }
     let(:source_project) { fork_project(project, author, repository: true) }
 
     let(:merge_request) do
@@ -31,8 +31,10 @@ RSpec.describe 'Merge request > User opens checkout branch modal', :js, feature_
     it 'shows instructions' do
       visit project_merge_request_path(project, merge_request)
 
-      click_button 'Code'
-      click_button 'Check out branch'
+      page.within 'main' do
+        click_button 'Code'
+        click_button 'Check out branch'
+      end
 
       expect(page).to have_content(source_project.http_url_to_repo)
     end