diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
index 8579df9c058..3820fc37606 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -28,7 +28,7 @@
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration) => unknown) => unknown
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration) => unknown) => Promise<unknown>
 	 * }}
 	 */
 	function bootstrapWindowLib() {
diff --git a/src/vs/code/electron-browser/workbench/workbench.js b/src/vs/code/electron-browser/workbench/workbench.js
index 0dbd586ee2c..003f8d91e23 100644
--- a/src/vs/code/electron-browser/workbench/workbench.js
+++ b/src/vs/code/electron-browser/workbench/workbench.js
@@ -66,7 +66,7 @@
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../platform/windows/common/windows').INativeWindowConfiguration) => unknown, options: object) => unknown,
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../platform/windows/common/windows').INativeWindowConfiguration) => unknown, options: object) => Promise<unknown>
 	 * }}
 	 */
 	function bootstrapWindowLib() {
diff --git a/src/vs/code/electron-sandbox/issue/issueReporter.js b/src/vs/code/electron-sandbox/issue/issueReporter.js
index cbf458f050d..784ca9acc17 100644
--- a/src/vs/code/electron-sandbox/issue/issueReporter.js
+++ b/src/vs/code/electron-sandbox/issue/issueReporter.js
@@ -16,7 +16,7 @@
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration) => unknown, options?: { forceEnableDeveloperKeybindings?: boolean, disallowReloadKeybinding?: boolean }) => unknown
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration) => unknown, options?: { forceEnableDeveloperKeybindings?: boolean, disallowReloadKeybinding?: boolean }) => Promise<unknown>
 	 * }}
 	 */
 	function bootstrapWindowLib() {
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js b/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
index 14e5800a8a1..fad8641ce69 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
@@ -16,7 +16,7 @@
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration) => unknown, options?: { forceEnableDeveloperKeybindings?: boolean }) => unknown
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration) => unknown, options?: { forceEnableDeveloperKeybindings?: boolean }) => Promise<unknown>
 	 * }}
 	 */
 	function bootstrapWindowLib() {
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js
index d056563dc11..52b100f2b42 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.js
+++ b/src/vs/code/electron-sandbox/workbench/workbench.js
@@ -66,7 +66,7 @@
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../platform/windows/common/windows').INativeWindowConfiguration) => unknown, options: object) => unknown,
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../platform/windows/common/windows').INativeWindowConfiguration) => unknown, options: object) => Promise<unknown>
 	 * }}
 	 */
 	function bootstrapWindowLib() {
diff --git a/src/vs/platform/windows/electron-main/window.ts b/src/vs/platform/windows/electron-main/window.ts
index 76f7bc7a5c6..03da743777a 100644
--- a/src/vs/platform/windows/electron-main/window.ts
+++ b/src/vs/platform/windows/electron-main/window.ts
@@ -871,8 +871,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			release: release()
 		};
 
-		// Developer tools
-		configuration.forceEnableDeveloperKeybindings = !!((process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath);
+		// Force enable developer tools for extension development
+		configuration.forceEnableDeveloperKeybindings = Array.isArray(configuration.extensionDevelopmentPath);
 
 		// Store into config object URL
 		this.configObjectUrl.update(configuration);