1 files changed, 10 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index cbb663f15..80b6e5834 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
@@ -60,6 +60,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
     private static final String ARG_SECRET_KEY_ID = "secret_key_id";
 
     public static final int MESSAGE_OKAY = 1;
+    public static final int MESSAGE_CANCEL = 2;
 
     private Messenger mMessenger;
     private EditText mPassphraseEditText;
@@ -215,7 +216,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
 
             @Override
             public void onClick(DialogInterface dialog, int id) {
-                dismiss();
+                dialog.cancel();
             }
         });
 
@@ -235,6 +236,14 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
         }
     }
 
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        super.onCancel(dialog);
+
+        dismiss();
+        sendMessageToHandler(MESSAGE_CANCEL);
+    }
+
     /**
      * Associate the "done" button on the soft keyboard with the okay button in the view
      */