diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 9bba335cc..ba4943384 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -194,9 +194,9 @@ Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |
 end
 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
   wait_until(3) do
-    current_path = path_to(page_name)
+    current_path = URI.parse(current_url).path
+    current_path == path_to(page_name)
   end
 
   if current_path.respond_to? :should