diff --git a/bazarr/main.py b/bazarr/main.py
index 2c3ca2ded..e66681afa 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 
-bazarr_version = '0.8.3.2'
+bazarr_version = '0.8.3.3'
 
 import os
 os.environ["SZ_USER_AGENT"] = "Bazarr/1"
@@ -190,6 +190,7 @@ def shutdown():
         else:
             stop_file.write('')
             stop_file.close()
+            sys.exit(0)
 
 
 @route(base_url + 'restart')
@@ -208,6 +209,7 @@ def restart():
             logging.info('Bazarr is being restarted...')
             restart_file.write('')
             restart_file.close()
+            sys.exit(0)
 
 
 @route(base_url + 'wizard')
diff --git a/views/menu.tpl b/views/menu.tpl
index e83ca35a2..a44b7b7a4 100644
--- a/views/menu.tpl
+++ b/views/menu.tpl
@@ -276,11 +276,11 @@
 		$('#loader_text').text("Bazarr is restarting. Please Wait...");
 		$.ajax({
 			url: "{{base_url}}restart",
-			async: true
+			async: true,
+			error: (function(){
+    			setTimeout(function(){ setInterval(ping, 2000); },8000);
+			})
 		})
-		.done(function(){
-    		setTimeout(function(){ setInterval(ping, 2000); },8000);
-		});
 	});
 
 	% from config import settings
diff --git a/views/system.tpl b/views/system.tpl
index 01faaa1a7..3b66e5360 100644
--- a/views/system.tpl
+++ b/views/system.tpl
@@ -419,12 +419,12 @@
 	$('#restart').on('click', function(){
 		$('#loader_text').text("Bazarr is restarting, please wait...");
 		$.ajax({
-			url: "{{base_url}}restart",
-			async: true
-		})
-		.done(function(){
-    		setTimeout(function(){ setInterval(ping, 2000); },8000);
-		})
+            url: "{{base_url}}restart",
+            async: true,
+            error: (function () {
+                setTimeout(function () { setInterval(ping, 2000); }, 8000);
+            })
+        });
 	});
 
     % from config import settings