diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9ee9e5ee11d..213183bc072 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -66,14 +66,32 @@
 		},
 		{
 			"type": "npm",
-			"script": "kill-watchd",
-			"label": "Kill Build VS Code",
+			"script": "kill-watch-clientd",
+			"label": "Kill Build VS Code Core",
 			"group": "build",
 			"presentation": {
 				"reveal": "never"
 			},
 			"problemMatcher": "$tsc"
 		},
+		{
+			"type": "npm",
+			"script": "kill-watch-extensionsd",
+			"label": "Kill Build VS Code Extensions",
+			"group": "build",
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": "$tsc"
+		},
+		{
+			"label": "Kill Build VS Code",
+			"dependsOn": [
+				"Kill Build VS Code Core",
+				"Kill Build VS Code Extensions"
+			],
+			"group": "build"
+		},
 		{
 			"type": "npm",
 			"script": "watch-webd",
diff --git a/package.json b/package.json
index e84e00a9a4d..dcd8b65d841 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,10 @@
     "restart-watch-webd": "deemon --restart yarn watch-web",
     "watch-client": "gulp watch-client --max_old_space_size=4095",
     "watch-clientd": "deemon yarn watch-client",
+    "kill-watch-clientd": "deemon --kill yarn watch-client",
     "watch-extensions": "gulp watch-extensions --max_old_space_size=4095",
     "watch-extensionsd": "deemon yarn watch-extensions",
+    "kill-watch-extensionsd": "deemon --kill yarn watch-extensions",
     "mocha": "mocha test/unit/node/all.js --delay",
     "precommit": "node build/gulpfile.hygiene.js",
     "gulp": "gulp --max_old_space_size=8192",