diff --git a/keybindings.json b/keybindings.json
index e614801..f3ad63f 100644
--- a/keybindings.json
+++ b/keybindings.json
@@ -60,14 +60,6 @@
         "command": "editor.action.commentLine",
         "when": "editorTextFocus && !editorReadonly"
     },
-    {
-        "key": "cmd+2",
-        "command": "workbench.action.focusSecondEditorGroup"
-    },
-    {
-        "key": "cmd+1",
-        "command": "workbench.action.focusFirstEditorGroup"
-    },
     {
         "key": "cmd+b",
         "command": "workbench.action.toggleSidebarVisibility"
@@ -210,47 +202,47 @@
     {
         "key": "cmd+1",
         "command": "workbench.action.openEditorAtIndex1",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+2",
         "command": "workbench.action.openEditorAtIndex2",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+3",
         "command": "workbench.action.openEditorAtIndex3",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+4",
         "command": "workbench.action.openEditorAtIndex4",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+5",
         "command": "workbench.action.openEditorAtIndex5",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+6",
         "command": "workbench.action.openEditorAtIndex6",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+7",
         "command": "workbench.action.openEditorAtIndex7",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+8",
         "command": "workbench.action.openEditorAtIndex8",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+9",
         "command": "workbench.action.openEditorAtIndex9",
-        "when": "editorFocus"
+        "when": "editorFocus || terminalEditorFocus"
     },
     {
         "key": "cmd+0",
@@ -354,32 +346,37 @@
     {
         "key": "cmd+1",
         "command": "workbench.action.terminal.focusAtIndex1",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
     },
     {
         "key": "cmd+2",
         "command": "workbench.action.terminal.focusAtIndex2",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
     },
     {
         "key": "cmd+3",
         "command": "workbench.action.terminal.focusAtIndex3",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
     },
     {
         "key": "cmd+4",
         "command": "workbench.action.terminal.focusAtIndex4",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
     },
     {
         "key": "cmd+5",
         "command": "workbench.action.terminal.focusAtIndex5",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
     },
     {
         "key": "cmd+6",
         "command": "workbench.action.terminal.focusAtIndex6",
-        "when": "terminalFocus || terminalFindFocused"
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
+    },
+    {
+        "key": "cmd+7",
+        "command": "workbench.action.terminal.focusAtIndex7",
+        "when": "(terminalFocus || terminalFindFocused) && !terminalEditorFocus"
     },
     {
         "key": "cmd+shift+e",