diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 59736732d8..ee16f8521f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -190,7 +190,7 @@ public class FragmentBase extends Fragment {
         finished = true;
 
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            getParentFragmentManager().popBackStackImmediate();
+            getParentFragmentManager().popBackStack();
         else
             finish = true;
     }