diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index 92715917ee..0373f47e96 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -23,7 +23,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
@@ -190,13 +189,6 @@ public class FragmentDialogFolder extends FragmentDialogBase {
             }
         });
 
-        new Handler().post(new Runnable() {
-            @Override
-            public void run() {
-                etSearch.clearFocus();
-            }
-        });
-
         Bundle args = new Bundle();
         args.putLong("account", account);
 
diff --git a/app/src/main/res/layout/dialog_folder_select.xml b/app/src/main/res/layout/dialog_folder_select.xml
index d2f6e85c74..4fb2ded44f 100644
--- a/app/src/main/res/layout/dialog_folder_select.xml
+++ b/app/src/main/res/layout/dialog_folder_select.xml
@@ -3,6 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:descendantFocusability="beforeDescendants"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     android:padding="12dp">
 
     <eu.faircode.email.FixedTextView