diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index 38d25f6a6..40969db8c 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -95,7 +95,8 @@ class AtomApplication
   addWindow: (window) ->
     @windows.push window
     @applicationMenu?.enableWindowSpecificItems(true)
-    @autoUpdateManager.emitUpdateAvailableEvent(window)
+    window.once 'window:loaded', =>
+      @autoUpdateManager.emitUpdateAvailableEvent(window)
 
   # Creates server to listen for additional atom application launches.
   #