diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 2c9da5c9b..502590418 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -1142,7 +1142,8 @@ class WorkspacesDisplay extends St.Widget {
     }
 
     _onKeyPressEvent(actor, event) {
-        if (!this.mapped)
+        const { ControlsState } = OverviewControls;
+        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
             return Clutter.EVENT_PROPAGATE;
 
         const { workspaceManager } = global;