diff --git a/app/app.html b/app/app.html
index 81f3ecb..12fd903 100644
--- a/app/app.html
+++ b/app/app.html
@@ -19,11 +19,6 @@
     <div id="root"></div>
     <script>
       (function() {
-        if (process.env.NODE_ENV === 'development') {
-          const devtoolsInstaller = require('electron-devtools-installer');
-          devtoolsInstaller.default(devtoolsInstaller.REACT_DEVELOPER_TOOLS).catch(() => {});
-        }
-
         const script = document.createElement('script');
         script.src = (process.env.HOT) ? 'http://localhost:3000/dist/bundle.js' : '../dist/bundle.js';
         document.write(script.outerHTML);
diff --git a/main.development.js b/main.development.js
index 5791892..393fb10 100644
--- a/main.development.js
+++ b/main.development.js
@@ -15,7 +15,24 @@ app.on('window-all-closed', () => {
 });
 
 
-app.on('ready', () => {
+const installExtensions = async () => {
+  if (process.env.NODE_ENV === 'development') {
+    const installer = require('electron-devtools-installer'); // eslint-disable-line global-require
+    const extensions = [
+      'REACT_DEVELOPER_TOOLS',
+      'REDUX_DEVTOOLS'
+    ];
+    for (const name of extensions) {
+      try {
+        await installer.default(installer[name]);
+      } catch (e) {} // eslint-disable-line
+    }
+  }
+};
+
+app.on('ready', async () => {
+  await installExtensions();
+
   mainWindow = new BrowserWindow({
     show: false,
     width: 1024,
diff --git a/package.json b/package.json
index 142f3ba..139c3e2 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "build-renderer": "cross-env NODE_ENV=production node -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.production.js --progress --profile --colors",
     "build": "npm run build-main && npm run build-renderer",
     "start": "cross-env NODE_ENV=production electron ./",
-    "start-hot": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./main.development",
+    "start-hot": "cross-env HOT=1 NODE_ENV=development electron -r babel-register -r babel-polyfill ./main.development",
     "package": "cross-env NODE_ENV=production node -r babel-register package.js",
     "package-all": "npm run package -- --all",
     "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
diff --git a/webpack.config.base.js b/webpack.config.base.js
index cb4e6cb..f589880 100644
--- a/webpack.config.base.js
+++ b/webpack.config.base.js
@@ -17,7 +17,7 @@ export default {
     libraryTarget: 'commonjs2'
   },
   resolve: {
-    extensions: ['', '.js', '.jsx'],
+    extensions: ['', '.js', '.jsx', '.json'],
     packageMains: ['webpack', 'browser', 'web', 'browserify', ['jam', 'main'], 'main']
   },
   plugins: [
diff --git a/webpack.config.electron.js b/webpack.config.electron.js
index 287c499..e883d1c 100644
--- a/webpack.config.electron.js
+++ b/webpack.config.electron.js
@@ -6,7 +6,7 @@ export default {
 
   devtool: 'source-map',
 
-  entry: './main.development',
+  entry: ['babel-polyfill', './main.development'],
 
   output: {
     ...baseConfig.output,