diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
index 7bfa4b631b5..88e20ed62fb 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
@@ -156,7 +156,7 @@ private void populateAppList() {
         public void onStop() {
             super.onStop();
 
-            dismiss();
+            dismissAllowingStateLoss();
         }
 
         @NonNull
@@ -265,7 +265,7 @@ private void startOpenKeychainInstallActivity() {
         public void onStop() {
             super.onStop();
 
-            dismiss();
+            dismissAllowingStateLoss();
         }
 
         @Override