diff --git a/.yarnrc b/.yarnrc
index 135e10442a7..4c5125d8923 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "7.3.2"
+target "8.3.3"
 runtime "electron"
diff --git a/cgmanifest.json b/cgmanifest.json
index cb9954628dd..1fb78691e71 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
+					"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "78.0.3904.130"
+			"version": "80.0.3987.165"
 		},
 		{
 			"component": {
@@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
+					"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.8.1"
+			"version": "12.13.0"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "5f93e889020d279d5a9cd1ecab080ab467312447"
+					"commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "7.3.2"
+			"version": "8.3.3"
 		},
 		{
 			"component": {
diff --git a/package.json b/package.json
index 19c54d9f9c7..cee07480e4f 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "css-loader": "^3.2.0",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "7.3.2",
+    "electron": "8.3.3",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",
diff --git a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
index 6222be78028..7b43355ed6d 100644
--- a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
+++ b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
@@ -9,9 +9,10 @@ import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_
 export function registerContextMenuListener(): void {
 	ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
 		const menu = createMenu(event, onClickChannel, items);
+		const window = BrowserWindow.fromWebContents(event.sender);
 
 		menu.popup({
-			window: BrowserWindow.fromWebContents(event.sender),
+			window: window ? window : undefined,
 			x: options ? options.x : undefined,
 			y: options ? options.y : undefined,
 			positioningItem: options ? options.positioningItem : undefined,
diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts
index 233f1690c98..40a2cf28940 100644
--- a/src/vs/platform/launch/electron-main/launchMainService.ts
+++ b/src/vs/platform/launch/electron-main/launchMainService.ts
@@ -156,6 +156,8 @@ export class LaunchMainService implements ILaunchMainService {
 			else {
 				const lastActive = this.windowsMainService.getLastActiveWindow();
 				if (lastActive) {
+					// Force focus the app before requesting window focus
+					app.focus({ steal: true });
 					lastActive.focus();
 
 					usedWindows = [lastActive];
diff --git a/yarn.lock b/yarn.lock
index 4d9927a94b6..7a80f8efd29 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2737,10 +2737,10 @@ electron-to-chromium@^1.2.7:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
   integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=
 
-electron@7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-7.3.2.tgz#184b69fe9089693e179b3b34effa975dfc8e505d"
-  integrity sha512-5uSWVfCJogiPiU0G+RKi4ECnNs0gPNjAwYVE9KR7RXaOJYcpNIC5RFejaaUnuRoBssJ5B1n/5WU6wDUxvPajWQ==
+electron@8.3.3:
+  version "8.3.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-8.3.3.tgz#8ce07dcbafa097d00b94d1dd58a2a3b30fe6f803"
+  integrity sha512-/LGnjnE9BQzkn2VpjflLi7jpQxYIp+maqmiDPy6ww76hkQvt/LJ991ewdHpfLR4or3VqzPIu+AK+ZJrTlDAWyw==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"