diff --git a/electron/debug.js b/electron/debug.js
index ac43eda3d91..bffbdf2e909 100644
--- a/electron/debug.js
+++ b/electron/debug.js
@@ -72,7 +72,7 @@ module.exports = opts => {
   opts = Object.assign({
     enabled: null,
     showDevTools: true,
-    devToolsMode: 'undocked'
+    devToolsMode: 'docked'
   }, opts);
 
   if (opts.enabled === false) {
diff --git a/electron/main.js b/electron/main.js
index 69bed3a02c1..482f8e7036f 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -28,7 +28,7 @@ if (IS_DEV) {
 }
 
 const app = electron.app;
-require('./debug')();
+require('./debug')({ showDevTools: IS_DEV });
 let mainWin;
 let nestedWinParams = { isDarwinForceQuit: false };