diff --git a/client/gui.py b/client/gui.py
index a5044521..c2f2410a 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -320,7 +320,7 @@ def password_dialog():
     result = dialog.run()
     pw = current_pw_entry.get_text()
     dialog.destroy()
-    if result: return pw
+    if result != gtk.RESPONSE_CANCEL: return pw
 
 def change_password_dialog(wallet, parent, icon):
     if parent: