diff --git a/tests/browser/features/step_definitions/search_steps.rb b/tests/browser/features/step_definitions/search_steps.rb
index ecf734b..ff63ebf 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -37,7 +37,7 @@ When(/^I press the enter key$/) do
 end
 
 When(/^I click the search overlay close button$/) do
-  on(ArticlePage).search_overlay_close_button_element.click
+  on(ArticlePage).search_overlay_close_button_element.when_visible.click
 end
 
 When(/^I see the search overlay$/) do
diff --git a/tests/browser/features/support/pages/article_page.rb b/tests/browser/features/support/pages/article_page.rb
index f462adb..0dd9ab0 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -65,9 +65,9 @@ class ArticlePage
   text_field(:search_box2, name: 'search', index: 1)
   li(:search_results, css: '.search-overlay .page-list li')
   div(:search_watchstars, css: '.search-overlay .page-list li .watch-this-article')
-  div(:search_overlay, class: 'search-overlay')
+  div(:search_overlay, css: '.search-overlay')
   button(:search_overlay_close_button) do |page|
-    page.search_overlay_element.button_element(class: 'cancel')
+    page.search_overlay_element.button_element(css: '.header-action .cancel')
   end
   ul(:search_overlay_page_list) do |page|
     page.search_overlay_element.element.ul(class: 'page-list thumbs actionable')