diff --git a/assets/default-keybindings.json b/assets/default-keybindings.json
index 4a4b7a5fa..86a31d96b 100644
--- a/assets/default-keybindings.json
+++ b/assets/default-keybindings.json
@@ -55,8 +55,7 @@
     },
     {
       "command": "app:focusCmdInput",
-      "keys": ["Cmd:i"],
-      "commandStr":"/mainview session;/screen:set focus=cmd;/screen:set focus=input"
+      "keys": ["Cmd:i"]
     },
     {
       "command": "app:focusSelectedLine",
diff --git a/src/models/model.ts b/src/models/model.ts
index 1588fc68a..ee7fa3539 100644
--- a/src/models/model.ts
+++ b/src/models/model.ts
@@ -228,7 +228,11 @@ class Model {
         for (let index = 1; index <= 9; index++) {
             this.keybindManager.registerKeybinding("app", "model", "app:selectWorkspace-" + index, null);
         }
-        this.keybindManager.registerKeybinding("app", "model", "app:focusCmdInput", null);
+        this.keybindManager.registerKeybinding("app", "model", "app:focusCmdInput", (waveEvent) => {
+            console.log("focus cmd input callback");
+            this.onFocusCmdInputPressed();
+            return true;
+        });
         this.keybindManager.registerKeybinding("app", "model", "app:bookmarkActiveLine", null);
         this.keybindManager.registerKeybinding("app", "model", "app:openHistory", null);
         this.keybindManager.registerKeybinding("app", "model", "app:openTabSearchModal", (waveEvent) => {