diff --git a/keybindings_mac.json b/keybindings_mac.json
index 508ebc2..6ef3a98 100644
--- a/keybindings_mac.json
+++ b/keybindings_mac.json
@@ -43,7 +43,13 @@
     },
     {
         "key": "cmd+f",
-        "command": "actions.find"
+        "command": "actions.find",
+        "when": "!findInputFocussed"
+    },
+    {
+        "key": "cmd+f",
+        "command": "editor.action.nextMatchFindAction",
+        "when": "findInputFocussed"
     },
     {
         "key": "cmd+n",