diff --git a/build/package.json b/build/package.json
index 95c077a09f0..84556e6e17d 100644
--- a/build/package.json
+++ b/build/package.json
@@ -42,7 +42,7 @@
     "request": "^2.85.0",
     "terser": "4.3.8",
     "tslint": "^5.9.1",
-    "typescript": "3.7.0-beta",
+    "typescript": "3.6.2",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.5.4",
     "xml2js": "^0.4.17"
diff --git a/build/yarn.lock b/build/yarn.lock
index 4260a5d2823..2451df9b537 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -2297,10 +2297,10 @@ typed-rest-client@^0.9.0:
     tunnel "0.0.4"
     underscore "1.8.3"
 
-typescript@3.7.0-beta:
-  version "3.7.0-beta"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-beta.tgz#4ad556e0eee14b90ecc39261001690e16e5eeba9"
-  integrity sha512-4jyCX+IQamrPJxgkABPq9xf+hUN+GWHVxoj+oey1TadCPa4snQl1RKwUba+1dyzYCamwlCxKvZQ3TjyWLhMGBA==
+typescript@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
+  integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
 
 typescript@^3.0.1:
   version "3.5.3"
diff --git a/package.json b/package.json
index b1e43d98771..7f469d57bb0 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "source-map": "^0.4.4",
     "ts-loader": "^4.4.2",
     "tslint": "^5.16.0",
-    "typescript": "3.7.0-beta",
+    "typescript": "3.6",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
index 4e813aeed88..9cd4185fd76 100644
--- a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
@@ -568,6 +568,7 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 
 	public layout(): void {
 		// noop
+
 	}
 
 	private readonly _hasFindResult = this._register(new Emitter<boolean>());
@@ -629,15 +630,21 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 	}
 
 	public showFind() {
-		this._webviewFindWidget?.reveal();
+		if (this._webviewFindWidget) {
+			this._webviewFindWidget.reveal();
+		}
 	}
 
 	public hideFind() {
-		this._webviewFindWidget?.hide();
+		if (this._webviewFindWidget) {
+			this._webviewFindWidget.hide();
+		}
 	}
 
 	public runFindAction(previous: boolean) {
-		this._webviewFindWidget?.find(previous);
+		if (this._webviewFindWidget) {
+			this._webviewFindWidget.find(previous);
+		}
 	}
 
 	public reload() {
@@ -645,26 +652,38 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 	}
 
 	public selectAll() {
-		this._webview?.selectAll();
+		if (this._webview) {
+			this._webview.selectAll();
+		}
 	}
 
 	public copy() {
-		this._webview?.copy();
+		if (this._webview) {
+			this._webview.copy();
+		}
 	}
 
 	public paste() {
-		this._webview?.paste();
+		if (this._webview) {
+			this._webview.paste();
+		}
 	}
 
 	public cut() {
-		this._webview?.cut();
+		if (this._webview) {
+			this._webview.cut();
+		}
 	}
 
 	public undo() {
-		this._webview?.undo();
+		if (this._webview) {
+			this._webview.undo();
+		}
 	}
 
 	public redo() {
-		this._webview?.redo();
+		if (this._webview) {
+			this._webview.redo();
+		}
 	}
 }
diff --git a/yarn.lock b/yarn.lock
index 3327954654b..8b48f5f6231 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8515,10 +8515,10 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
-typescript@3.7.0-beta:
-  version "3.7.0-beta"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-beta.tgz#4ad556e0eee14b90ecc39261001690e16e5eeba9"
-  integrity sha512-4jyCX+IQamrPJxgkABPq9xf+hUN+GWHVxoj+oey1TadCPa4snQl1RKwUba+1dyzYCamwlCxKvZQ3TjyWLhMGBA==
+typescript@3.6:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
+  integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
 
 typescript@^2.6.2:
   version "2.6.2"