diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts
index 27c4e6d2f1d..69b4e8dc511 100644
--- a/src/vs/code/electron-main/auth.ts
+++ b/src/vs/code/electron-main/auth.ts
@@ -77,8 +77,13 @@ export class ProxyAuthHandler {
 		const javascript = 'promptForCredentials(' + JSON.stringify(data) + ')';
 
 		event.preventDefault();
+
+		const onWindowClose = () => cb('', '');
+		win.on('close', onWindowClose);
+
 		win.webContents.executeJavaScript(javascript, true).then(({ username, password }: Credentials) => {
 			cb(username, password);
+			win.removeListener('close', onWindowClose);
 			win.close();
 		});
 	}