diff --git a/lib/fedoradistribution.pm b/lib/fedoradistribution.pm
index 0796fea6..5189a021 100644
--- a/lib/fedoradistribution.pm
+++ b/lib/fedoradistribution.pm
@@ -26,10 +26,8 @@ sub init() {
 
 sub x11_start_program($$$) {
     my ($self, $program, $timeout, $options) = @_;
-    # TODO: take screenshots of every goddamn 'run command' dialog in
-    # every goddamn desktop and keep them updated forever
     send_key "alt-f2";
-    sleep 3;
+    assert_screen "desktop_runner";
     type_string $program;
     wait_idle 5; # because of KDE dialog - SUSE guys are doing the same!
     send_key "ret", 1;
diff --git a/needles/gnome_desktop_runner.json b/needles/gnome_desktop_runner.json
new file mode 100644
index 00000000..90d41df8
--- /dev/null
+++ b/needles/gnome_desktop_runner.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "xpos": 356,
+      "ypos": 356,
+      "width": 74,
+      "height": 37,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DESKTOP-gnome",
+    "ENV-FLAVOR-workstation_live",
+    "ENV-LANGUAGE-ALL",
+    "desktop_runner"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome_desktop_runner.png b/needles/gnome_desktop_runner.png
new file mode 100644
index 00000000..bd72f53e
Binary files /dev/null and b/needles/gnome_desktop_runner.png differ
diff --git a/needles/graphical_login_sddm.json b/needles/graphical_login_sddm.json
index 3913a52d..d6d133de 100644
--- a/needles/graphical_login_sddm.json
+++ b/needles/graphical_login_sddm.json
@@ -2,8 +2,7 @@
   "tags": [
     "graphical_login",
     "ENV-DESKTOP-kde",
-    "ENV-DISTRI-fedora",
-    "ENV-INSTLANG-en_US",
+    "ENV-LANGUAGE-ENGLISH",
     "ENV-FLAVOR-kde_live"
   ],
   "properties": [],
@@ -23,4 +22,4 @@
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde_desktop_runner.json b/needles/kde_desktop_runner.json
new file mode 100644
index 00000000..65c3cdc9
--- /dev/null
+++ b/needles/kde_desktop_runner.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "xpos": 307,
+      "ypos": 3,
+      "width": 93,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "desktop_runner",
+    "ENV-DESKTOP-kde",
+    "ENV-LANGUAGE-ALL",
+    "ENV-FLAVOR-kde_live"
+  ],
+  "properties": []
+}
diff --git a/needles/kde_desktop_runner.png b/needles/kde_desktop_runner.png
new file mode 100644
index 00000000..8add8b9a
Binary files /dev/null and b/needles/kde_desktop_runner.png differ