diff --git a/src/octoprint/plugins/announcements/static/js/announcements.js b/src/octoprint/plugins/announcements/static/js/announcements.js
index 2fe4dbb7..be569b5f 100644
--- a/src/octoprint/plugins/announcements/static/js/announcements.js
+++ b/src/octoprint/plugins/announcements/static/js/announcements.js
@@ -258,22 +258,22 @@ $(function() {
                         buttons: [{
                             text: gettext("Later"),
                             click: function(notice) {
-                                self.hiddenChannels.push(key);
                                 notice.remove();
+                                self.hiddenChannels.push(key);
                             }
                         }, {
                             text: gettext("Mark read"),
                             click: function(notice) {
-                                self.markRead(key, value.last);
                                 notice.remove();
+                                self.markRead(key, value.last);
                             }
                         }, {
                             text: gettext("Read..."),
                             addClass: "btn-primary",
                             click: function(notice) {
+                                notice.remove();
                                 self.showAnnouncementDialog(key);
                                 self.markRead(key, value.last);
-                                notice.remove();
                             }
                         }]
                     },
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 0ee352e0..6ea6e897 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -685,17 +685,21 @@ $(function() {
                         hide: false
                     };
 
+                    var restartClicked = false;
                     if (self.restartCommandSpec) {
                         options.confirm = {
                             confirm: true,
                             buttons: [{
                                 text: gettext("Restart now"),
-                                click: function () {
+                                click: function (notice) {
+                                    if (restartClicked) return;
+                                    restartClicked = true;
                                     showConfirmationDialog({
                                         message: gettext("This will restart your OctoPrint server."),
                                         onproceed: function() {
                                             OctoPrint.system.executeCommand("core", "restart")
                                                 .done(function() {
+                                                    notice.remove();
                                                     new PNotify({
                                                         title: gettext("Restart in progress"),
                                                         text: gettext("The server is now being restarted in the background")
@@ -707,6 +711,9 @@ $(function() {
                                                         text: gettext("Trying to restart the server produced an error, please check octoprint.log for details. You'll have to restart manually.")
                                                     })
                                                 });
+                                        },
+                                        onclose: function() {
+                                            restartClicked = false;
                                         }
                                     });
                                 }
@@ -716,6 +723,7 @@ $(function() {
 
                     notification = PNotify.singleButtonNotify(options);
                 } else if (response.needs_refresh) {
+                    var refreshClicked = false;
                     notification = PNotify.singleButtonNotify({
                         title: titleSuccess,
                         text: textReload,
@@ -724,6 +732,8 @@ $(function() {
                             buttons: [{
                                 text: gettext("Reload now"),
                                 click: function () {
+                                    if (refreshClicked) return;
+                                    refreshClicked = true;
                                     location.reload(true);
                                 }
                             }]
diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
index cfc20cb5..5431186d 100644
--- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
+++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
@@ -123,8 +123,9 @@ $(function() {
         self.config_updateMethod = ko.observable();
         self.config_releaseChannel = ko.observable();
 
-        self.configurationDialog = $("#settings_plugin_softwareupdate_configurationdialog");
-        self.confirmationDialog = $("#softwareupdate_confirmation_dialog");
+        self.configurationDialog = undefined;
+        self.confirmationDialog = undefined;
+        self._updateClicked = false;
 
         self.config_availableCheckTypes = ko.observableArray([]);
         self.config_availableReleaseChannels = ko.observableArray([]);
@@ -357,7 +358,11 @@ $(function() {
                         }, {
                             text: gettext("Update now"),
                             addClass: "btn-primary",
-                            click: self.update
+                            click: function() {
+                                if (self._updateClicked) return;
+                                self._updateClicked = true;
+                                self.update();
+                            }
                         }]
                     };
                     options["buttons"] = {
@@ -501,8 +506,14 @@ $(function() {
         };
 
         self.update = function(force) {
-            if (self.updateInProgress) return;
-            if (!self.loginState.isAdmin()) return;
+            if (self.updateInProgress) {
+                self._updateClicked = false;
+                return;
+            }
+            if (!self.loginState.isAdmin()) {
+                self._updateClicked = false;
+                return;
+            }
 
             if (self.printerState.isPrinting()) {
                 self._showPopup({
@@ -510,6 +521,7 @@ $(function() {
                     text: gettext("A print job is currently in progress. Updating will be prevented until it is done."),
                     type: "error"
                 });
+                self._updateClicked = false;
             } else {
                 self.forceUpdate = (force == true);
                 self.confirmationDialog.modal("show");
@@ -518,9 +530,13 @@ $(function() {
         };
 
         self.confirmUpdate = function() {
-            self.confirmationDialog.modal("hide");
             self.performUpdate(self.forceUpdate,
                 _.map(self.availableAndPossible(), function(info) { return info.key }));
+            self.confirmationDialog.modal("hide");
+        };
+
+        self.confirmationHidden = function() {
+            self._updateClicked = false;
         };
 
         self._showWorkingDialog = function(title) {
@@ -578,6 +594,10 @@ $(function() {
         self.onStartup = function() {
             self.workingDialog = $("#settings_plugin_softwareupdate_workingdialog");
             self.workingOutput = $("#settings_plugin_softwareupdate_workingdialog_output");
+            self.configurationDialog = $("#settings_plugin_softwareupdate_configurationdialog");
+            self.confirmationDialog = $("#softwareupdate_confirmation_dialog");
+
+            self.confirmationDialog.on("hidden", self.confirmationHidden);
         };
 
         self.onServerDisconnect = function() {
diff --git a/src/octoprint/static/js/app/helpers.js b/src/octoprint/static/js/app/helpers.js
index 98a24d5b..744ce15b 100644
--- a/src/octoprint/static/js/app/helpers.js
+++ b/src/octoprint/static/js/app/helpers.js
@@ -646,6 +646,7 @@ function showConfirmationDialog(msg, onacknowledge, options) {
     var proceed = options.proceed || gettext("Proceed");
     var proceedClass = options.proceedClass || "danger";
     var onproceed = options.onproceed || undefined;
+    var onclose = options.onclose || undefined;
     var dialogClass = options.dialogClass || "";
 
     var modalHeader = $('<a href="javascript:void(0)" class="close" data-dismiss="modal" aria-hidden="true">&times;</a><h3>' + title + '</h3>');
@@ -663,14 +664,19 @@ function showConfirmationDialog(msg, onacknowledge, options) {
         .append($('<div></div>').addClass('modal-header').append(modalHeader))
         .append($('<div></div>').addClass('modal-body').append(modalBody))
         .append($('<div></div>').addClass('modal-footer').append(cancelButton).append(proceedButton));
+    modal.on('hidden', function(event) {
+        if (onclose && _.isFunction(onclose)) {
+            onclose(event);
+        }
+    });
     modal.modal("show");
 
     proceedButton.click(function(e) {
         e.preventDefault();
-        modal.modal("hide");
         if (onproceed && _.isFunction(onproceed)) {
             onproceed(e);
         }
+        modal.modal("hide");
     });
 
     return modal;