diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 26d49db90..cbbc0c118 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -247,6 +247,10 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
                     break;
                 }
             }
+        } else if (resultCode == RESULT_CANCELED) {
+            bindingDialog.dismiss();
+            setResult(RESULT_CANCELED, data);
+            finish();
         }
     }