diff --git a/lib/utils.pm b/lib/utils.pm
index 9d96e6fd..17a87ff2 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -462,9 +462,13 @@ sub gnome_initial_setup {
     }
     else {
         # wait for the stupid 'help' screen to show and kill it
-        assert_screen "getting_started";
-        send_key "alt-f4";
-        wait_still_screen 5;
+        if (check_screen "getting_started") {
+            send_key "alt-f4";
+            wait_still_screen 5;
+        }
+        else {
+            record_soft_failure "'getting started' missing (probably BGO#790811)";
+        }
         # don't do it again on second load
     }
     set_var("_setup_done", 1);
diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index 0b3e186e..366227c3 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -81,9 +81,13 @@ sub run {
         }
         if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
             # wait for the stupid 'help' screen to show and kill it
-            assert_screen "getting_started";
-            send_key "alt-f4";
-            wait_still_screen 5;
+            if (check_screen "getting_started") {
+                send_key "alt-f4";
+                wait_still_screen 5;
+            }
+            else {
+                record_soft_failure "'getting started' missing (probably BGO#790811)";
+            }
         }
 
         # Move the mouse somewhere it won't highlight the match areas