diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index c1cba5feac..7414c383bb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -294,6 +294,8 @@ public class FragmentDialogFolder extends FragmentDialogBase {
         fabAdd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                etSearch.setText(null);
+
                 Bundle args = new Bundle();
                 args.putLong("account", account);