diff --git a/browser/finder/index.js b/browser/finder/index.js
index dc3e9342..b92637e4 100644
--- a/browser/finder/index.js
+++ b/browser/finder/index.js
@@ -11,9 +11,17 @@ import _ from 'lodash'
 import dataStore from 'browser/lib/dataStore'
 
 const electron = require('electron')
-const { clipboard, ipcRenderer } = electron
+const { clipboard, ipcRenderer, remote } = electron
 const path = require('path')
 
+if (process.env.NODE_ENV === 'development') {
+  window.addEventListener('keydown', function (e) {
+    if (e.keyCode === 73 && e.metaKey && e.altKey) {
+      remote.getCurrentWindow().toggleDevTools()
+    }
+  })
+}
+
 function hideFinder () {
   ipcRenderer.send('hide-finder')
 }
diff --git a/browser/main/index.js b/browser/main/index.js
index 5573d2b1..1ab663ed 100644
--- a/browser/main/index.js
+++ b/browser/main/index.js
@@ -10,6 +10,15 @@ import activityRecord from 'browser/lib/activityRecord'
 const electron = require('electron')
 const ipc = electron.ipcRenderer
 const path = require('path')
+const remote = electron.remote
+
+if (process.env.NODE_ENV === 'development') {
+  window.addEventListener('keydown', function (e) {
+    if (e.keyCode === 73 && e.metaKey && e.altKey) {
+      remote.getCurrentWindow().toggleDevTools()
+    }
+  })
+}
 
 activityRecord.init()
 window.addEventListener('online', function () {
diff --git a/lib/finder-menu.js b/lib/finder-menu.js
index 22dd6109..bce97da0 100644
--- a/lib/finder-menu.js
+++ b/lib/finder-menu.js
@@ -75,16 +75,6 @@ var view = {
       click: function () {
         BrowserWindow.getFocusedWindow().reload()
       }
-    // },
-    // {
-    //   label: 'Toggle Developer Tools',
-    //   accelerator: (function () {
-    //     if (process.platform === 'darwin') return 'Alt+Command+I'
-    //     else return 'Ctrl+Shift+I'
-    //   })(),
-    //   click: function (item, focusedWindow) {
-    //     if (focusedWindow) BrowserWindow.getFocusedWindow().toggleDevTools()
-    //   }
     }
   ]
 }
diff --git a/lib/main-menu.js b/lib/main-menu.js
index 7791fa66..1218fed0 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -149,16 +149,6 @@ var view = {
       click: function () {
         BrowserWindow.getFocusedWindow().reload()
       }
-    // },
-    // {
-    //   label: 'Toggle Developer Tools',
-    //   accelerator: (function () {
-    //     if (process.platform === 'darwin') return 'Alt+Command+I'
-    //     else return 'Ctrl+Shift+I'
-    //   })(),
-    //   click: function (item, focusedWindow) {
-    //     if (focusedWindow) BrowserWindow.getFocusedWindow().toggleDevTools()
-    //   }
     }
   ]
 }
diff --git a/webpack.config.js b/webpack.config.js
index 5176d0ec..5078168f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,5 +1,4 @@
 const skeleton = require('./webpack-skeleton')
-const webpack = require('webpack')
 const path = require('path')
 
 var config = Object.assign({}, skeleton, {