diff --git a/app/main.dev.js b/app/main.dev.js
index f3ec7071..a52c3d4b 100644
--- a/app/main.dev.js
+++ b/app/main.dev.js
@@ -287,6 +287,12 @@ app.on('ready', async () => {
     mainWindow.loadURL(`file://${__dirname}/dist/index.html`)
   }
 
+  if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
+    mainWindow.webContents.once('dom-ready', () => {
+      mainWindow.openDevTools()
+    })
+  }
+
   // @TODO: Use 'ready-to-show' event
   //        https://github.com/electron/electron/blob/master/docs/api/browser-window.md#using-ready-to-show-event
   mainWindow.webContents.on('did-finish-load', () => {
diff --git a/app/menu.js b/app/menu.js
index 150dea1c..23376f0a 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -9,10 +9,6 @@ export default class MenuBuilder {
   }
 
   buildMenu() {
-    if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
-      this.setupDevelopmentEnvironment()
-    }
-
     let template
 
     if (process.platform === 'darwin') {
@@ -58,10 +54,6 @@ export default class MenuBuilder {
     })
   }
 
-  setupDevelopmentEnvironment() {
-    this.mainWindow.openDevTools()
-  }
-
   buildDarwinTemplate() {
     const subMenuAbout = {
       label: 'Electron',