diff --git a/app/scripts/menus.js b/app/scripts/menus.js
index 44c00b2556f2..62628e365586 100644
--- a/app/scripts/menus.js
+++ b/app/scripts/menus.js
@@ -128,8 +128,17 @@ if (process.platform === 'darwin') {
 					}
 				},
 				{
-					label: 'Toggle DevTools',
+					label: 'Toggle DevTools - current server',
 					accelerator: 'Command+Alt+I',
+					click: function() {
+						const activeWebview = webview.getActive();
+						if (activeWebview) {
+							activeWebview.openDevTools();
+						}
+					}
+				},
+				{
+					label: 'Toggle DevTools - application',
 					click: function() {
 						remote.getCurrentWindow().toggleDevTools();
 					}
@@ -251,8 +260,17 @@ if (process.platform === 'darwin') {
 					}
 				},
 				{
-					label: 'Toggle DevTools',
+					label: 'Toggle DevTools - current server',
 					accelerator: 'Ctrl+Shift+I',
+					click: function() {
+						const activeWebview = webview.getActive();
+						if (activeWebview) {
+							activeWebview.openDevTools();
+						}
+					}
+				},
+				{
+					label: 'Toggle DevTools - application',
 					click: function() {
 						remote.getCurrentWindow().toggleDevTools();
 					}
diff --git a/app/scripts/sidebar.js b/app/scripts/sidebar.js
index 772921ffa886..5f6111c42b02 100644
--- a/app/scripts/sidebar.js
+++ b/app/scripts/sidebar.js
@@ -236,8 +236,7 @@ var selectedInstance = null;
 var instanceMenu = remote.Menu.buildFromTemplate([{
 	label: 'Reload server',
 	click: function() {
-		const activeWebview = webview.getByUrl(selectedInstance.dataset.host);
-		activeWebview.reload();
+		webview.getByUrl(selectedInstance.dataset.host).reload();
 	}
 }, {
 	label: 'Remove server',
@@ -247,7 +246,7 @@ var instanceMenu = remote.Menu.buildFromTemplate([{
 }, {
 	label: 'Open DevTools',
 	click: function() {
-		document.querySelector(`webview[server="${selectedInstance.dataset.host}"]`).openDevTools();
+		webview.getByUrl(selectedInstance.dataset.host).openDevTools();
 	}
 }]);