diff --git a/electron.js b/electron.js
index 48e8ace930..2d1a6d9755 100644
--- a/electron.js
+++ b/electron.js
@@ -251,6 +251,8 @@ function createWindow () {
 	});
 
 	win.on('close', (e) => {
+		Util.log('info', 'close: ' + app.isQuiting);
+
 		if (app.isQuiting) {
 			return;
 		};
@@ -810,7 +812,7 @@ app.on('before-quit', (e) => {
 	Util.log('info', 'before-quit');
 
 	if (app.isQuiting) {
-		exit(0);
+		app.exit(0);
 	} else {
 		e.preventDefault();
 		exit(false);
@@ -835,16 +837,14 @@ function send () {
 function shutdown (relaunch) {
 	Util.log('info', 'Shutdown, relaunch: ' + relaunch);
 
-	setTimeout(() => {
-		if (relaunch) {
-			Util.log('info', 'Relaunch');
-			app.isQuiting = true;
-			app.relaunch();
-			app.exit(0);
-		} else {
-			app.exit(0);
-		};
-	}, 3000);
+	if (relaunch) {
+		Util.log('info', 'Relaunch');
+		app.isQuiting = true;
+		app.relaunch();
+		app.exit(0);
+	} else {
+		app.exit(0);
+	};
 };
 
 function exit (relaunch) {
diff --git a/package-lock.json b/package-lock.json
index 7cc72b2137..8a55c6af4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
 				"electron-is-dev": "^2.0.0",
 				"electron-json-storage": "^4.3.0",
 				"electron-log": "^3.0.9",
-				"electron-updater": "^4.3.7",
+				"electron-updater": "^4.6.1",
 				"electron-util": "^0.12.3",
 				"electron-window-state": "^5.0.3",
 				"emoji-mart": "^2.11.2",
diff --git a/package.json b/package.json
index 88d550da9c..ec3ea8c98a 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
 		"electron-is-dev": "^2.0.0",
 		"electron-json-storage": "^4.3.0",
 		"electron-log": "^3.0.9",
-		"electron-updater": "^4.3.7",
+		"electron-updater": "^4.6.1",
 		"electron-util": "^0.12.3",
 		"electron-window-state": "^5.0.3",
 		"emoji-mart": "^2.11.2",