diff --git a/keybindings.json b/keybindings.json
index 99aa557..856dffc 100644
--- a/keybindings.json
+++ b/keybindings.json
@@ -160,12 +160,14 @@
         "when": "terminalFocus"
     },
     {
-        "key": "cmd+shift+t",
-        "command": "workbench.action.terminal.newInActiveWorkspace"
+        "key": "cmd+t",
+        "command": "workbench.action.terminal.newInActiveWorkspace",
+        "when": "terminalFocus"
     },
     {
-        "key": "cmd+shift+w",
-        "command": "workbench.action.terminal.kill"
+        "key": "cmd+w",
+        "command": "workbench.action.terminal.kill",
+        "when": "terminalFocus"
     },
     {
         "key": "cmd+shift+]",
@@ -227,7 +229,7 @@
     {
         "key": "cmd+t",
         "command": "workbench.action.debug.stop",
-        "when": "inDebugMode"
+        "when": "inDebugMode && !terminalFocus"
     },
     {
         "key": "cmd+r",
@@ -244,4 +246,9 @@
         "command": "editor.debug.action.toggleBreakpoint",
         "when": "editorTextFocus"
     },
+    {
+        "key": "shift+cmd+t",
+        "command": "workbench.action.debug.restart",
+        "when": "inDebugMode"
+    },
 ]