diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index e8f3b30f4..5127ab924 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -380,6 +380,13 @@ var AuthenticationDialog = GObject.registerClass({
         }
     }
 
+    close(timestamp) {
+        // Ensure cleanup if the dialog was never shown
+        if (this.state === ModalDialog.State.CLOSED)
+            this._onDialogClosed();
+        super.close(timestamp);
+    }
+
     cancel() {
         this.close(global.get_current_time());
         this._emitDone(true);