diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 39e0499422..891e9d5d0e 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -87,7 +87,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 @Override
                 public void run() {
                     try {
-                        searching = true;
+                        searching = model.isSearching();
                         handler.post(new Runnable() {
                             @Override
                             public void run() {
diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index 525161e4e8..fb271cacb9 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -75,6 +75,11 @@ public class ViewModelBrowse extends ViewModel {
         currentState.index = -1;
     }
 
+    boolean isSearching() {
+        State state = currentState;
+        return (state != null && state.search != null);
+    }
+
     void load() throws MessagingException, IOException {
         State state = currentState;
         if (state == null)