diff --git a/app/src/main/java/eu/faircode/email/SearchViewEx.java b/app/src/main/java/eu/faircode/email/SearchViewEx.java
index 765461548a..788677f081 100644
--- a/app/src/main/java/eu/faircode/email/SearchViewEx.java
+++ b/app/src/main/java/eu/faircode/email/SearchViewEx.java
@@ -129,8 +129,9 @@ public class SearchViewEx extends SearchView {
             @Override
             public boolean onSuggestionClick(int position) {
                 Cursor cursor = (Cursor) getSuggestionsAdapter().getItem(position);
-                setQuery(cursor.getString(1), true);
-                return false;
+                long id = cursor.getInt(0);
+                setQuery(cursor.getString(1), id != -1);
+                return (id == -1);
             }
         });
     }