diff --git a/src/main/windows/about.js b/src/main/windows/about.js
index 3c89c542ce..83cc5155a7 100644
--- a/src/main/windows/about.js
+++ b/src/main/windows/about.js
@@ -32,7 +32,7 @@ function init () {
   // No menu on the About window
   win.setMenu(null)
 
-  win.webContents.once('did-finish-load', function () {
+  win.once('ready-to-show', function () {
     win.show()
   })
 
diff --git a/src/main/windows/main.js b/src/main/windows/main.js
index 5f46274c9c..c0c9dd8e32 100644
--- a/src/main/windows/main.js
+++ b/src/main/windows/main.js
@@ -38,13 +38,17 @@ function init (state, options) {
     title: config.APP_WINDOW_TITLE,
     titleBarStyle: 'hidden-inset', // Hide title bar (Mac)
     useContentSize: true, // Specify web page size without OS chrome
-    show: !options.hidden,
+    show: false,
     width: initialBounds.width,
     height: initialBounds.height,
     x: initialBounds.x,
     y: initialBounds.y
   })
 
+  win.once('ready-to-show', function () {
+    if (!options.hidden) win.show()
+  })
+
   win.loadURL(config.WINDOW_MAIN)
 
   if (win.setSheetOffset) win.setSheetOffset(config.UI_HEADER_HEIGHT)