diff --git a/spec/system/page_objects/pages/search.rb b/spec/system/page_objects/pages/search.rb
index 5e60f76cf67..f115897616a 100644
--- a/spec/system/page_objects/pages/search.rb
+++ b/spec/system/page_objects/pages/search.rb
@@ -30,11 +30,11 @@ module PageObjects
       end
 
       def has_search_result?
-        within(".search-results") { page.has_selector?(".fps-result", visible: true) }
+        page.has_selector?(".search-results .fps-result")
       end
 
       def has_warning_message?
-        within(".search-results") { page.has_selector?(".warning", visible: true) }
+        page.has_selector?(".search-results .warning")
       end
 
       def is_search_page
diff --git a/spec/system/search_spec.rb b/spec/system/search_spec.rb
index 9329d819907..0b7acbbd2ed 100644
--- a/spec/system/search_spec.rb
+++ b/spec/system/search_spec.rb
@@ -58,7 +58,7 @@ describe "Search", type: :system, js: true do
         search_page.click_search_button
       end
 
-      # Rate limit error should kick in after 15 queries
+      # Rate limit error should kick in after 4 queries
       expect(search_page).to have_warning_message
     end
   end