diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 53abd748d7b..949609d7682 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -7,7 +7,7 @@
 
 const path = require('path');
 const fs = require('fs');
-const remote = require('electron').remote;
+const ipc = require('electron').ipcRenderer;
 
 function assign(destination, source) {
 	return Object.keys(source)
@@ -97,9 +97,9 @@ function main() {
 	window.addEventListener('keydown', function (e) {
 		const key = extractKey(e);
 		if (key === TOGGLE_DEV_TOOLS_KB) {
-			remote.getCurrentWebContents().toggleDevTools();
+			ipc.send('vscode:toggleDevTools');
 		} else if (key === RELOAD_KB) {
-			remote.getCurrentWindow().reload();
+			ipc.send('vscode:reloadWindow');
 		}
 	});
 
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 66861d351bf..cd5c7bb1251 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import 'vs/css!./media/issueReporter';
-import { shell, ipcRenderer, webFrame, remote, clipboard } from 'electron';
+import { shell, ipcRenderer, webFrame, clipboard } from 'electron';
 import { localize } from 'vs/nls';
 import { $ } from 'vs/base/browser/dom';
 import * as collections from 'vs/base/common/collections';
@@ -91,7 +91,7 @@ export class IssueReporter extends Disposable {
 
 		this.previewButton = new Button(document.getElementById('issue-reporter'));
 
-		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
+		ipcRenderer.on('vscode:issuePerformanceInfoResponse', (event, info) => {
 			this.logService.trace('issueReporter: Received performance data');
 			this.issueReporterModel.update(info);
 			this.receivedPerformanceInfo = true;
@@ -102,7 +102,7 @@ export class IssueReporter extends Disposable {
 			this.updatePreviewButtonState();
 		});
 
-		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
+		ipcRenderer.on('vscode:issueSystemInfoResponse', (event, info) => {
 			this.logService.trace('issueReporter: Received system data');
 			this.issueReporterModel.update({ systemInfo: info });
 			this.receivedSystemInfo = true;
@@ -111,9 +111,9 @@ export class IssueReporter extends Disposable {
 			this.updatePreviewButtonState();
 		});
 
-		ipcRenderer.send('issueSystemInfoRequest');
+		ipcRenderer.send('vscode:issueSystemInfoRequest');
 		if (configuration.data.issueType === IssueType.PerformanceIssue) {
-			ipcRenderer.send('issuePerformanceInfoRequest');
+			ipcRenderer.send('vscode:issuePerformanceInfoRequest');
 		}
 		this.logService.trace('issueReporter: Sent data requests');
 
@@ -308,7 +308,7 @@ export class IssueReporter extends Disposable {
 			const issueType = parseInt((<HTMLInputElement>event.target).value);
 			this.issueReporterModel.update({ issueType: issueType });
 			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
-				ipcRenderer.send('issuePerformanceInfoRequest');
+				ipcRenderer.send('vscode:issuePerformanceInfoRequest');
 			}
 			this.updatePreviewButtonState();
 			this.render();
@@ -384,14 +384,14 @@ export class IssueReporter extends Disposable {
 		this.previewButton.onDidClick(() => this.createIssue());
 
 		this.addEventListener('disableExtensions', 'click', () => {
-			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
+			ipcRenderer.send('vscode:workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
 		});
 
 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
 			e.stopPropagation();
 			if (e.keyCode === 13 || e.keyCode === 32) {
-				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
-				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
+				ipcRenderer.send('vscode:workbenchCommand', 'workbench.extensions.action.disableAll');
+				ipcRenderer.send('vscode:workbenchCommand', 'workbench.action.reloadWindow');
 			}
 		});
 
@@ -400,7 +400,7 @@ export class IssueReporter extends Disposable {
 			// Cmd/Ctrl+Enter previews issue and closes window
 			if (cmdOrCtrlKey && e.keyCode === 13) {
 				if (this.createIssue()) {
-					remote.getCurrentWindow().close();
+					ipcRenderer.send('vscode:closeIssueReporter');
 				}
 			}
 
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorer.js b/src/vs/code/electron-browser/processExplorer/processExplorer.js
index 0a798fb876d..92ffa3e6c9e 100644
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -7,7 +7,7 @@
 
 const path = require('path');
 const fs = require('fs');
-const remote = require('electron').remote;
+const ipc = require('electron').ipcRenderer;
 
 function assign(destination, source) {
 	return Object.keys(source)
@@ -141,9 +141,9 @@ function main() {
 	window.addEventListener('keydown', function (e) {
 		const key = extractKey(e);
 		if (key === TOGGLE_DEV_TOOLS_KB) {
-			remote.getCurrentWebContents().toggleDevTools();
+			ipc.send('vscode:toggleDevTools');
 		} else if (key === RELOAD_KB) {
-			remote.getCurrentWindow().reload();
+			ipc.send('vscode:reloadWindow');
 		}
 	});
 
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
index fe402f18792..379eab77cf3 100644
--- a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
@@ -198,7 +198,7 @@ export function startup(data: ProcessExplorerData): void {
 	applyZoom(data.zoomLevel);
 
 	// Map window process pids to titles, annotate process names with this when rendering to distinguish between them
-	ipcRenderer.on('windowsInfoResponse', (event, windows) => {
+	ipcRenderer.on('vscode:windowsInfoResponse', (event, windows) => {
 		mapPidToWindowTitle = new Map<number, string>();
 		windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
 	});
diff --git a/src/vs/code/electron-browser/proxy/auth.html b/src/vs/code/electron-browser/proxy/auth.html
index e27ec2fc02e..f01e2b70601 100644
--- a/src/vs/code/electron-browser/proxy/auth.html
+++ b/src/vs/code/electron-browser/proxy/auth.html
@@ -79,11 +79,6 @@
 </body>
 
 <script>
-	const electron = require('electron');
-	const shell = electron.shell;
-	const ipc = electron.ipcRenderer;
-	const remote = electron.remote;
-	const currentWindow = remote.getCurrentWindow();
 
 	function promptForCredentials(data) {
 		return new Promise((c, e) => {
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index c783bbd281d..9cf82bb50de 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { app, ipcMain as ipc, systemPreferences, shell } from 'electron';
+import { app, ipcMain as ipc, systemPreferences, shell, Event } from 'electron';
 import * as platform from 'vs/base/common/platform';
 import { WindowsManager } from 'vs/code/electron-main/windows';
 import { IWindowsService, OpenContext, ActiveWindowManager } from 'vs/platform/windows/common/windows';
@@ -194,15 +194,15 @@ export class CodeApplication {
 			this.windowsMainService.openNewWindow(OpenContext.DESKTOP); //macOS native tab "+" button
 		});
 
-		ipc.on('vscode:exit', (event: any, code: number) => {
+		ipc.on('vscode:exit', (event: Event, code: number) => {
 			this.logService.trace('IPC#vscode:exit', code);
 
 			this.dispose();
 			this.lifecycleService.kill(code);
 		});
 
-		ipc.on('vscode:fetchShellEnv', event => {
-			const webContents = event.sender.webContents;
+		ipc.on('vscode:fetchShellEnv', (event: Event) => {
+			const webContents = event.sender;
 			getShellEnvironment().then(shellEnv => {
 				if (!webContents.isDestroyed()) {
 					webContents.send('vscode:acceptShellEnv', shellEnv);
@@ -216,7 +216,7 @@ export class CodeApplication {
 			});
 		});
 
-		ipc.on('vscode:broadcast', (event: any, windowId: number, broadcast: { channel: string; payload: any; }) => {
+		ipc.on('vscode:broadcast', (event: Event, windowId: number, broadcast: { channel: string; payload: any; }) => {
 			if (this.windowsMainService && broadcast.channel && !isUndefinedOrNull(broadcast.payload)) {
 				this.logService.trace('IPC#vscode:broadcast', broadcast.channel, broadcast.payload);
 
@@ -232,6 +232,18 @@ export class CodeApplication {
 			this.labelService.registerFormater(scheme, formater);
 		});
 
+		ipc.on('vscode:toggleDevTools', (event: Event) => {
+			event.sender.toggleDevTools();
+		});
+
+		ipc.on('vscode:openDevTools', (event: Event) => {
+			event.sender.openDevTools();
+		});
+
+		ipc.on('vscode:reloadWindow', (event: Event) => {
+			event.sender.reload();
+		});
+
 		// Keyboard layout changes
 		KeyboardLayoutMonitor.INSTANCE.onDidChangeKeyboardLayout(() => {
 			if (this.windowsMainService) {
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index cebb4e61237..475deedd92d 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -10,7 +10,7 @@ import { localize } from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-import { BrowserWindow, ipcMain, screen } from 'electron';
+import { BrowserWindow, ipcMain, screen, Event } from 'electron';
 import { ILaunchService } from 'vs/code/electron-main/launch';
 import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -34,22 +34,28 @@ export class IssueService implements IIssueService {
 	) { }
 
 	openReporter(data: IssueReporterData): TPromise<void> {
-		ipcMain.on('issueSystemInfoRequest', event => {
+		ipcMain.on('vscode:issueSystemInfoRequest', (event: Event) => {
 			this.getSystemInformation().then(msg => {
-				event.sender.send('issueSystemInfoResponse', msg);
+				event.sender.send('vscode:issueSystemInfoResponse', msg);
 			});
 		});
 
-		ipcMain.on('issuePerformanceInfoRequest', event => {
+		ipcMain.on('vscode:issuePerformanceInfoRequest', (event: Event) => {
 			this.getPerformanceInfo().then(msg => {
-				event.sender.send('issuePerformanceInfoResponse', msg);
+				event.sender.send('vscode:issuePerformanceInfoResponse', msg);
 			});
 		});
 
-		ipcMain.on('workbenchCommand', (event, arg) => {
+		ipcMain.on('vscode:workbenchCommand', (event, arg) => {
 			this._issueParentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
 		});
 
+		ipcMain.on('vscode:closeIssueReporter', (event: Event) => {
+			if (this._issueWindow) {
+				this._issueWindow.close();
+			}
+		});
+
 		this._issueParentWindow = BrowserWindow.getFocusedWindow();
 		const position = this.getWindowPosition(this._issueParentWindow, 700, 800);
 		if (!this._issueWindow) {
@@ -91,9 +97,9 @@ export class IssueService implements IIssueService {
 	}
 
 	openProcessExplorer(data: ProcessExplorerData): TPromise<void> {
-		ipcMain.on('windowsInfoRequest', event => {
+		ipcMain.on('windowsInfoRequest', (event: Event) => {
 			this.launchService.getMainProcessInfo().then(info => {
-				event.sender.send('windowsInfoResponse', info.windows);
+				event.sender.send('vscode:windowsInfoResponse', info.windows);
 			});
 		});
 
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index 74ad36e324a..6d4706fc371 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -13,7 +13,6 @@ perf.mark('renderer/started');
 const path = require('path');
 const fs = require('fs');
 const electron = require('electron');
-const remote = electron.remote;
 const ipc = electron.ipcRenderer;
 
 Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
@@ -35,7 +34,7 @@ process.lazyEnv = new Promise(function (resolve) {
 
 function onError(error, enableDeveloperTools) {
 	if (enableDeveloperTools) {
-		remote.getCurrentWebContents().openDevTools();
+		ipc.send('vscode:openDevTools');
 	}
 
 	console.error('[uncaught exception]: ' + error);
@@ -168,9 +167,9 @@ function registerListeners(enableDeveloperTools) {
 		listener = function (e) {
 			const key = extractKey(e);
 			if (key === TOGGLE_DEV_TOOLS_KB) {
-				remote.getCurrentWebContents().toggleDevTools();
+				ipc.send('vscode:toggleDevTools');
 			} else if (key === RELOAD_KB) {
-				remote.getCurrentWindow().reload();
+				ipc.send('vscode:reloadWindow');
 			}
 		};
 		window.addEventListener('keydown', listener);