diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index c634dfe3..01dd2173 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -553,7 +553,7 @@ $(function() {
                         title: titleSuccess,
                         text: textRestart,
                         buttons: {
-                            closer: false,
+                            closer: true,
                             sticker: false
                         },
                         callbacks: {
@@ -606,7 +606,7 @@ $(function() {
                             }]
                         },
                         buttons: {
-                            closer: false,
+                            closer: true,
                             sticker: false
                         },
                         callbacks: {
@@ -698,6 +698,10 @@ $(function() {
         };
 
         self.onUserLoggedOut = function() {
+            self._closeAllNotifications();
+        };
+
+        self._closeAllNotifications = function() {
             if (self.notifications) {
                 _.each(self.notifications, function(notification) {
                     notification.remove();
@@ -705,6 +709,11 @@ $(function() {
             }
         };
 
+        self.onServerDisconnect = function() {
+            self._closeAllNotifications();
+            return true;
+        };
+
         self.onStartup = function() {
             self.workingDialog = $("#settings_plugin_pluginmanager_workingdialog");
             self.workingOutput = $("#settings_plugin_pluginmanager_workingdialog_output");