diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index e304c2a46..6367bcc8f 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -304,6 +304,10 @@ var AuthenticationDialog = GObject.registerClass({
             this._session.disconnect(this._sessionShowInfoId);
             this._session = null;
         }
+
+        this._passwordBox.hide();
+        this._cancelButton.grab_key_focus();
+        this._okButton.reactive = false;
     }
 
     _onUserChanged() {