1 files changed, 5 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_sees_merge_request_file_tree_sidebar_spec.rb b/spec/features/merge_request/user_sees_merge_request_file_tree_sidebar_spec.rb
index 8caa13c6297..8a039bf9840 100644
--- a/spec/features/merge_request/user_sees_merge_request_file_tree_sidebar_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_request_file_tree_sidebar_spec.rb
@@ -62,6 +62,11 @@ RSpec.describe 'Merge request > User sees merge request file tree sidebar', :js,
     context 'when navigating to the next file' do
       before do
         click_link 'Next'
+        wait_for_requests
+        # when we click the Next button the viewport will be scrolled a bit into the diffs view
+        # this will cause for the file tree sidebar height to be recalculated
+        # because this logic is async and debounced twice we have to wait for the layout to stabilize
+        sleep(1)
       end
 
       it_behaves_like 'last entry clickable'