diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index 8b4398624e..faf45f1312 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AutoCompleteTextView;
@@ -277,12 +278,6 @@ public class FragmentDialogSearch extends FragmentDialogBase {
                         // Do nothing
                     }
                 })
-                .setOnDismissListener(new DialogInterface.OnDismissListener() {
-                    @Override
-                    public void onDismiss(DialogInterface dialog) {
-                        imm.hideSoftInputFromWindow(etQuery.getWindowToken(), 0);
-                    }
-                })
                 .create();
 
         View.OnClickListener onClick = new View.OnClickListener() {
@@ -322,6 +317,12 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         return dialog;
     }
 
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+    }
+
     private void pickDate(TextView tv) {
         Object tag = tv.getTag();
         final Calendar cal = (tag == null ? Calendar.getInstance() : (Calendar) tag);