diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index d7cba814eb..8a4409dd39 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -531,7 +531,11 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
         btnInbox.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((FragmentBase) getParentFragment()).finish();
+                FragmentActivity activity = getActivity();
+                if (activity instanceof ActivitySetup)
+                    ((ActivitySetup) activity).onExit();
+                else
+                    ((FragmentBase) getParentFragment()).finish();
             }
         });