diff --git a/app/views/projects/blob/viewers/_loading.html.haml b/app/views/projects/blob/viewers/_loading.html.haml
index 120c0540335..df1f3e4e01b 100644
--- a/app/views/projects/blob/viewers/_loading.html.haml
+++ b/app/views/projects/blob/viewers/_loading.html.haml
@@ -1,2 +1,2 @@
 .text-center.prepend-top-default.append-bottom-default
-  = icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…')
+  = icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…', class: 'qa-spinner')
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 945b244df15..9c21d9ddbfa 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -51,6 +51,16 @@ module QA
           element :branches_dropdown
         end
 
+        view 'app/views/projects/blob/viewers/_loading.html.haml' do
+          element :spinner
+        end
+
+        def wait_for_viewers_to_load
+          wait(reload: false) do
+            has_no_element?(:spinner)
+          end
+        end
+
         def create_first_new_file!
           within_element(:quick_actions) do
             click_link_with_text 'New file'
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
index 3310a873a60..73f020e7d05 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
@@ -22,7 +22,11 @@ module QA
         end
 
         push.project.visit!
-        Page::Project::Show.perform(&:wait_for_push)
+
+        Page::Project::Show.perform do |page|
+          page.wait_for_push
+          page.wait_for_viewers_to_load
+        end
 
         expect(page).to have_content('README.md')
         expect(page).to have_content('This is a test project')