diff --git a/js/ui/main.js b/js/ui/main.js
index 2705a4026..4d8079a4d 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -737,7 +737,8 @@ export function pushModal(actor, params = {}) {
     });
 
     actionMode = newActionMode;
-    global.stage.set_key_focus(actor);
+    const newFocus = actor === global.stage ? null : actor;
+    global.stage.set_key_focus(newFocus);
     return grab;
 }