diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9cab8f2228..435b9eda81 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,9 +3,10 @@
   // List of configurations. Add new configurations or edit existing ones.
   "configurations": [
     {
-      "name": "Launch Apollo VSCode",
+      "name": "Launch VS Code Extension",
       "type": "extensionHost",
       "request": "launch",
+      "preLaunchTask": "npm: watch",
       "runtimeExecutable": "${execPath}",
       "args": [
         "--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-apollo"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index a758296bca..ef479b4ab3 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,35 +1,18 @@
 {
 	"version": "2.0.0",
 	"tasks": [
-		{
-			"label": "TypeScript watch",
-			"type": "shell",
-			"command": "./node_modules/.bin/tsc",
-			"args": [
-				"--build",
-				"./tsconfig.json",
-				"--watch"
-			],
-			"isBackground": true,
-			"problemMatcher": [
-				"$tsc-watch"
-			],
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-			"presentation": {
-				"reveal": "never",
-				"panel": "dedicated"
+			{
+					"type": "npm",
+					"script": "watch",
+					"problemMatcher": "$tsc-watch",
+					"isBackground": true,
+					"presentation": {
+							"reveal": "never"
+					},
+					"group": {
+							"kind": "build",
+							"isDefault": true
+					}
 			}
-		},
-		{
-			"type": "npm",
-			"script": "watch",
-			"problemMatcher": [
-				"$tsc-watch"
-			],
-			"isBackground": true
-		}
 	]
 }