diff --git a/src/main/menu.js b/src/main/menu.js
index 7e9ae9ab9a5..f5252472e4a 100644
--- a/src/main/menu.js
+++ b/src/main/menu.js
@@ -225,7 +225,7 @@ function collectionSubMenu() {
 }
 
 function viewSubMenu() {
-  const menu = {
+  return {
     label: '&View',
     submenu: [
       {
@@ -256,20 +256,17 @@ function viewSubMenu() {
         click: function() {
           ipc.broadcast('window:zoom-out');
         }
+      },
+      separator(),
+      {
+        label: '&Toggle DevTools',
+        accelerator: 'Alt+CmdOrCtrl+I',
+        click: function() {
+          BrowserWindow.getFocusedWindow().toggleDevTools();
+        }
       }
     ]
   };
-  if (process.env.NODE_ENV !== 'production') {
-    menu.submenu.push(separator());
-    menu.submenu.push({
-      label: '&Toggle DevTools',
-      accelerator: 'Alt+CmdOrCtrl+I',
-      click: function() {
-        BrowserWindow.getFocusedWindow().toggleDevTools();
-      }
-    });
-  }
-  return menu;
 }
 
 function windowSubMenu() {
diff --git a/src/main/window-manager.js b/src/main/window-manager.js
index 29f5aa05d06..7e2f0d480e3 100644
--- a/src/main/window-manager.js
+++ b/src/main/window-manager.js
@@ -117,12 +117,10 @@ var createWindow = module.exports.create = function(opts) {
     height: opts.height,
     icon: opts.icon,
     show: false,
-    devTools: process.env.NODE_ENV !== 'production',
     'min-width': opts.minwidth,
     'web-preferences': {
       'subpixel-font-scaling': true,
-      'direct-write': true,
-      'devTools': process.env.NODE_ENV !== 'production'
+      'direct-write': true
     }
   });
 
@@ -134,8 +132,7 @@ var createWindow = module.exports.create = function(opts) {
     'min-width': opts.minwidth,
     'web-preferences': {
       'subpixel-font-scaling': true,
-      'direct-write': true,
-      'devTools': false
+      'direct-write': true
     }
   });