diff --git a/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
index 6aef4c393..f8f3da992 100644
--- a/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
+++ b/database/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
@@ -203,14 +203,11 @@ class SearchHelper {
                 }
                 regex.matches(stringToCheck)
             } else {
-                searchParameters.searchQuery.split(" ").any { word ->
-                    if (word.isEmpty()) {
-                        false
-                    } else {
-                        specialComparison?.invoke(stringToCheck, word)
-                            ?: stringToCheck.contains(word, !searchParameters.caseSensitive)
-                    }
-                }
+                specialComparison?.invoke(stringToCheck, searchParameters.searchQuery)
+                    ?: stringToCheck.contains(
+                        searchParameters.searchQuery,
+                        !searchParameters.caseSensitive
+                    )
             }
         }
     }