diff --git a/js/ui/main.js b/js/ui/main.js
index bca2b22e5c73fcf89c40545c992204b7f1351582..6f961be7d629d2710b758a47808385a7816a2b15 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -90,8 +90,12 @@ function _sessionUpdated() {
                                   Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
 
-    if (!sessionMode.hasRunDialog && lookingGlass)
-        lookingGlass.close();
+    if (!sessionMode.hasRunDialog) {
+        if (runDialog)
+            runDialog.close();
+        if (lookingGlass)
+            lookingGlass.close();
+    }
 }
 
 function start() {