diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
index 097f0c0d6..bcf398973 100644
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -319,12 +319,7 @@ module.exports = class AtomApplication extends EventEmitter {
           this.promptForRestart()
         );
       });
-
-      // TodoElectronIssue: In electron v2 awaiting the watcher causes some delay
-      // in Windows machines, which affects directly the startup time.
-      if (process.platform !== 'win32') {
-        await this.configFilePromise;
-      }
+      await this.configFilePromise;
     }
 
     let optionsForWindowsToOpen = [];