diff --git a/qa/qa/page/settings/common.rb b/qa/qa/page/settings/common.rb
index 8cd0b6bb49c..bede3fde105 100644
--- a/qa/qa/page/settings/common.rb
+++ b/qa/qa/page/settings/common.rb
@@ -11,7 +11,7 @@ module QA
           within_element(element_name) do
             # Because it is possible to click the button before the JS toggle code is bound
             wait(reload: false) do
-              click_button 'Expand' unless first('button', text: 'Collapse')
+              click_button 'Expand' unless has_css?('button', text: 'Collapse')
 
               has_content?('Collapse')
             end