diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8a372952b6..a1ba0a5b9d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3320,7 +3320,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             public void onCurrentListChanged(@Nullable PagedList<TupleMessageEx> previousList, @Nullable PagedList<TupleMessageEx> currentList) {
                 boolean autoscroll =
                         (viewType == AdapterMessage.ViewType.THREAD ||
-                                prefs.getBoolean("autoscroll", false));
+                                (viewType != ViewType.SEARCH &&
+                                        prefs.getBoolean("autoscroll", false)));
 
                 int prev = 0;
                 if (autoscroll && previousList != null)