diff --git a/test/browser/maintenance_mode_test.rb b/test/browser/maintenance_mode_test.rb
index 7718f06a4..f940d3e10 100644
--- a/test/browser/maintenance_mode_test.rb
+++ b/test/browser/maintenance_mode_test.rb
@@ -27,7 +27,7 @@ class MaintenanceModeTest < TestCase
       css:     'a[href="#system/maintenance"]',
     )
 
-    exists_not(
+    watch_for_disappear(
       browser: browser2,
       css:     '.js-maintenanceMode',
     )
@@ -88,6 +88,10 @@ class MaintenanceModeTest < TestCase
       css:     'a[href="#system/maintenance"]',
     )
 
+    watch_for(
+      browser: browser1,
+      css:     '.content.active .js-modeSetting',
+    )
     switch(
       browser: browser1,
       css:     '.content.active .js-modeSetting',