diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index a0c886be..7194bf4a 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -41,7 +41,8 @@ sub run {
                 last if (check_screen "skip_button", 5);
             }
             # click 'Skip' one time
-            wait_screen_change { assert_and_click "skip_button", 5; };
+            assert_and_click "skip_button", 5;
+            wait_still_screen 5;
             send_key "ret";
             # wait for the stupid 'help' screen to show and kill it
             assert_screen "getting_started";