diff --git a/keybindings_mac.json b/keybindings_mac.json
index 5ba296e..edea888 100644
--- a/keybindings_mac.json
+++ b/keybindings_mac.json
@@ -181,12 +181,12 @@
     {
         "key": "cmd+t",
         "command": "workbench.action.terminal.newInActiveWorkspace",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+w",
         "command": "workbench.action.terminal.kill",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+shift+]",
@@ -339,32 +339,32 @@
     {
         "key": "cmd+1",
         "command": "workbench.action.terminal.focusAtIndex1",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+2",
         "command": "workbench.action.terminal.focusAtIndex2",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+3",
         "command": "workbench.action.terminal.focusAtIndex3",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+4",
         "command": "workbench.action.terminal.focusAtIndex4",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+5",
         "command": "workbench.action.terminal.focusAtIndex5",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+6",
         "command": "workbench.action.terminal.focusAtIndex6",
-        "when": "terminalFocus"
+        "when": "terminalFocus || terminalFindFocused"
     },
     {
         "key": "cmd+shift+e",
@@ -417,10 +417,14 @@
     {
         "key": "cmd+t",
         "command": "workbench.action.newWindow",
-        "when": "!inDebugMode && !terminalFocus"
+        "when": "!inDebugMode && !terminalFocus && !terminalFindFocused"
     },
     {
         "key": "shift+cmd+v",
         "command": "open-in-vim.open"
     },
+    {
+        "key": "ctrl+cmd+w",
+        "command": "-workbench.action.toggleTabsVisibility"
+    },
 ]
\ No newline at end of file