diff --git a/app/src/main/java/eu/faircode/email/DialogFragmentEx.java b/app/src/main/java/eu/faircode/email/DialogFragmentEx.java
index 0526d2cbfd..58b45a558f 100644
--- a/app/src/main/java/eu/faircode/email/DialogFragmentEx.java
+++ b/app/src/main/java/eu/faircode/email/DialogFragmentEx.java
@@ -14,8 +14,8 @@ public class DialogFragmentEx extends DialogFragment {
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
-        super.onDismiss(dialog);
         sendResult(RESULT_CANCELED);
+        super.onDismiss(dialog);
     }
 
     protected void sendResult(int result) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index de34b6b5be..8222a782e5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3276,8 +3276,6 @@ public class FragmentCompose extends FragmentBase {
             lvGroup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    dismiss();
-
                     int target = spTarget.getSelectedItemPosition();
                     Cursor cursor = (Cursor) adapter.getItem(position);
                     long group = cursor.getLong(0);
@@ -3288,6 +3286,7 @@ public class FragmentCompose extends FragmentBase {
                     args.putLong("group", group);
 
                     sendResult(Activity.RESULT_OK);
+                    dismiss();
                 }
             });
 
@@ -3325,13 +3324,12 @@ public class FragmentCompose extends FragmentBase {
                     .setAdapter(adapter, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            dismiss();
-
                             EntityAnswer answer = adapter.getItem(which);
                             String text = EntityAnswer.replacePlaceholders(
                                     answer.text, null, null, null, null);
 
                             getArguments().putString("answer", text);
+
                             sendResult(RESULT_OK);
                         }
                     })
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index a20db35541..8600f4cf40 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -75,12 +75,11 @@ public class FragmentDialogFolder extends DialogFragmentEx {
                         account, false, new AdapterFolder.IFolderSelectedListener() {
                     @Override
                     public void onFolderSelected(TupleFolderEx folder) {
-                        dismiss();
-
                         Bundle args = getArguments();
                         args.putLong("folder", folder.id);
 
                         sendResult(RESULT_OK);
+                        dismiss();
                     }
                 });