diff --git a/src/browser/main.coffee b/src/browser/main.coffee
index 5acddc495..d308c1e7f 100644
--- a/src/browser/main.coffee
+++ b/src/browser/main.coffee
@@ -14,6 +14,10 @@ process.on 'uncaughtException', (error={}) ->
   nslog(error.stack) if error.stack?
 
 start = ->
+  if process.platform is 'win32'
+    handleSquirrelEvents = require './squirrel-events'
+    return if handleSquirrelEvents()
+
   args = parseCommandLine()
 
   addPathToOpen = (event, pathToOpen) ->
@@ -32,10 +36,6 @@ start = ->
     setupCrashReporter()
 
   app.on 'ready', ->
-    if process.platform is 'win32'
-      handleSquirrelEvents = require './squirrel-events'
-      return if handleSquirrelEvents(args)
-
     app.removeListener 'open-file', addPathToOpen
     app.removeListener 'open-url', addUrlToOpen
 
diff --git a/src/browser/squirrel-events.coffee b/src/browser/squirrel-events.coffee
index 5b3b61f74..e07aa505e 100644
--- a/src/browser/squirrel-events.coffee
+++ b/src/browser/squirrel-events.coffee
@@ -13,15 +13,18 @@ removeShortcut = ->
   ChildProcess.execFile updateDotExe, ['--removeShortcut', exeName], ->
     app.quit()
 
-module.exports = (args) ->
-  if args['squirrel-install'] or args['squirrel-updated']
-    createShortcut()
-    true
-  else if args['squirrel-uninstall']
-    removeShortcut()
-    true
-  else if args['squirrel-obsolete']
-    app.quit()
-    true
-  else
-    false
+module.exports = ->
+  return false if process.argv.length isnt 2
+
+  switch process.argv[1]
+    when 'squirrel-install', 'squirrel-updated'
+      createShortcut()
+      true
+    when 'squirrel-uninstall'
+      removeShortcut()
+      true
+    when 'squirrel-obsolete'
+      app.quit()
+      true
+    else
+      false