diff --git a/.travis.yml b/.travis.yml
index 3e132083e5..0ebbd2cff6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
       - bsdtar
 
 node_js:
-  - '8.9.1'
+  - 9
 python:
   - "3.6"
 
diff --git a/app/components/shared/main-navigation.component.ts b/app/components/shared/main-navigation.component.ts
index 08c087a527..3f5c12b3fa 100644
--- a/app/components/shared/main-navigation.component.ts
+++ b/app/components/shared/main-navigation.component.ts
@@ -142,7 +142,11 @@ export class MainNavigationComponent implements OnInit {
 
     private _update() {
         if (OS.isWindows()) {
-            this._autoUpdater.quitAndInstall();
+            setImmediate(() => {
+                this.remote.electronApp.removeAllListeners("window-all-closed");
+                this.remote.getCurrentWindow().close();
+                this._autoUpdater.quitAndInstall();
+            });
         } else {
             this.shell.openExternal("https://azure.github.io/BatchLabs/");
         }
diff --git a/app/services/electron/remote.service.ts b/app/services/electron/remote.service.ts
index 85a90d26e3..8a77a6f24a 100644
--- a/app/services/electron/remote.service.ts
+++ b/app/services/electron/remote.service.ts
@@ -28,6 +28,10 @@ export class ElectronRemote {
         return remote.dialog;
     }
 
+    public get electronApp(): Electron.App {
+        return remote.app;
+    }
+
     /**
      * @returns The BrowserWindow object which this web page belongs to.
      */
diff --git a/electron-builder.yml b/electron-builder.yml
index 7dc309645d..164c70ac88 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -47,6 +47,7 @@ win:
 # Config for the windows installer
 nsis:
   oneClick: true
+  perMachine: true
 
 # Linux configuration
 linux:
diff --git a/package.json b/package.json
index 16e7c3dbca..d959486ea0 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "name": "Microsoft Corporation",
     "email": "tiguerin@microsoft.com"
   },
-  "version": "0.12.4",
+  "version": "0.11.4",
   "main": "build/client/main.prod.js",
   "scripts": {
     "ts": "ts-node --project tsconfig.node.json",