diff --git a/gnome-shell/firewall@subgraph.com/extension.js b/gnome-shell/firewall@subgraph.com/extension.js
index a6b3fe4..425ac6e 100644
--- a/gnome-shell/firewall@subgraph.com/extension.js
+++ b/gnome-shell/firewall@subgraph.com/extension.js
@@ -190,6 +190,12 @@ const FirewallPromptHandler = new Lang.Class({
 
     onCloseDialog: function() {
         log("SGFW: Closed dialog");
+        try {
+            this._dialog.close();
+            this._dialog.destroy();
+        } catch (err) {
+            log("SGFW: Unable to close/destroy modal...");
+        }
         this._dialog = null;
         if (this._dialogs.length > 0) {
             log("SGFW: Opening next dialogs (remaining: " + this._dialogs.length + ")");