diff --git a/app/assets/js/index.js b/app/assets/js/index.js
index 63deb18..2715cc7 100644
--- a/app/assets/js/index.js
+++ b/app/assets/js/index.js
@@ -4,11 +4,13 @@
 
 var ipc = require('electron').ipcRenderer;
 
-ipc.on('params', function(event, message) {
+var webView;
+
+ipc.on('params', function (event, message) {
     var appArgs = JSON.parse(message);
     document.title = appArgs.name;
 
-    var webView = document.createElement('webview');
+    webView = document.createElement('webview');
 
     webView.setAttribute('id', 'webView');
     webView.setAttribute('src', appArgs.targetUrl);
@@ -16,23 +18,21 @@ ipc.on('params', function(event, message) {
     webView.setAttribute('minwidth', '100');
     webView.setAttribute('minheight', '100');
 
-        webView.addEventListener('dom-ready', function() {
-            if (appArgs.userAgent) {
-                webView.setUserAgent(appArgs.userAgent);
-            }
-            if (appArgs.showDevTools) {
-                webView.openDevTools();
-            }
-        });
-    webView.addEventListener('new-window', function(e) {
+    webView.addEventListener('dom-ready', function () {
+        if (appArgs.userAgent) {
+            webView.setUserAgent(appArgs.userAgent);
+        }
+
+    });
+    webView.addEventListener('new-window', function (e) {
         require('shell').openExternal(e.url);
     });
 
     // We check for desktop notifications by listening to a title change in the webview
     // Not elegant, but it will have to do
     if (appArgs.badge) {
-        webView.addEventListener('did-finish-load', function(e) {
-            webView.addEventListener('page-title-set', function(event) {
+        webView.addEventListener('did-finish-load', function (e) {
+            webView.addEventListener('page-title-set', function (event) {
                 ipc.send('notification-message', 'TITLE_CHANGED');
             });
         });
@@ -42,3 +42,13 @@ ipc.on('params', function(event, message) {
     webViewDiv.appendChild(webView);
 });
 
+ipc.on('toggle-dev-tools', function (event, message) {
+    if (!message) {
+        return;
+    }
+    if (webView.isDevToolsOpened()) {
+        webView.closeDevTools();
+    } else {
+        webView.openDevTools();
+    }
+});
diff --git a/app/buildMenu.js b/app/buildMenu.js
index 6e9330e..ef14e2b 100644
--- a/app/buildMenu.js
+++ b/app/buildMenu.js
@@ -1,7 +1,7 @@
 var electron = require('electron');
 var Menu = electron.Menu;
 
-module.exports = function (app) {
+module.exports = function (app, mainWindow) {
     if (Menu.getApplicationMenu())
         return;
 
@@ -90,8 +90,10 @@ module.exports = function (app) {
                             return 'Ctrl+Shift+J';
                     })(),
                     click: function(item, focusedWindow) {
-                        if (focusedWindow)
-                            focusedWindow.toggleDevTools();
+                        if (focusedWindow) {
+                            mainWindow.webContents.send('toggle-dev-tools', true);
+                        }
+
                     }
                 },
             ]
diff --git a/app/main.js b/app/main.js
index b7b673b..54ad50b 100644
--- a/app/main.js
+++ b/app/main.js
@@ -25,7 +25,6 @@ app.on('window-all-closed', function() {
 });
 
 app.on('ready', function() {
-    buildMenu(app);
     mainWindow = new BrowserWindow(
         {
             width: appArgs.width || 1280,
@@ -36,6 +35,8 @@ app.on('ready', function() {
             }
         }
     );
+    
+    buildMenu(app, mainWindow);
 
     // uncomment to show dev tools for the main window
     //mainWindow.openDevTools();