diff --git a/src/main-process/squirrel-update.coffee b/src/main-process/squirrel-update.coffee
index acac81457..e1c4fef41 100644
--- a/src/main-process/squirrel-update.coffee
+++ b/src/main-process/squirrel-update.coffee
@@ -144,8 +144,9 @@ exports.handleStartupEvent = (app, squirrelCommand) ->
     when '--squirrel-updated'
       updateShortcuts ->
         addCommandsToPath ->
-          updateContextMenus ->
-            app.quit()
+          WinShell.fileHandler.update ->
+            updateContextMenus ->
+              app.quit()
       true
     when '--squirrel-uninstall'
       removeShortcuts ->
diff --git a/src/main-process/win-shell.coffee b/src/main-process/win-shell.coffee
index 94c841c47..baf02a9fc 100644
--- a/src/main-process/win-shell.coffee
+++ b/src/main-process/win-shell.coffee
@@ -33,7 +33,7 @@ class ShellOption
   update: (callback) =>
     new Registry({hive: 'HKCU', key: "#{@key}\\#{@parts[0].key}"})
       .get @parts[0].name, (err, val) =>
-        if err? or not val? or val.value.includes '\\' + exeName
+        if err? or not val?
           callback(err)
         else
           @register callback