diff --git a/keybindings_mac.json b/keybindings_mac.json
index fcdddbb..6caa95a 100644
--- a/keybindings_mac.json
+++ b/keybindings_mac.json
@@ -319,7 +319,12 @@
     {
         "key": "cmd+f",
         "command": "workbench.action.terminal.focusFind",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "terminalFocus && !terminalFindFocused"
+    },
+    {
+        "key": "cmd+f",
+        "command": "workbench.action.terminal.findNext",
+        "when": "terminalFindFocused"
     },
     {
         "key": "cmd+shift+]",