diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index f5c9c8f1c5..07d5506ef4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -286,6 +286,8 @@ public class FragmentOptions extends FragmentBase {
 
                     pager.setCurrentItem(tab);
                     FragmentBase fragment = (FragmentBase) adapter.instantiateItem(pager, tab);
+                    if (fragment instanceof FragmentSetup)
+                        ((FragmentSetup) fragment).prepareSearch();
                     fragment.scrollTo(resid, -48);
                     menuSearch.collapseActionView();
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 7030411740..3abfe2ca87 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -946,6 +946,18 @@ public class FragmentSetup extends FragmentBase {
         grpExtra.setVisibility(setup_extra ? View.VISIBLE : View.GONE);
     }
 
+    void prepareSearch() {
+        try {
+            manual = true;
+            updateManual();
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+            prefs.edit().putBoolean("setup_extra", true).apply();
+            updateExtra();
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+    }
+
     private void ensureVisible(View child) {
         view.post(new Runnable() {
             @Override