diff --git a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
index 55b5d58b2..3debcd1dc 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
@@ -237,14 +237,20 @@ class SearchHelper {
                 return false
             return if (searchParameters.isRegex) {
                 val regex = if (searchParameters.caseSensitive) {
-                    searchParameters.searchQuery.toRegex(RegexOption.DOT_MATCHES_ALL)
+                    searchParameters.searchQuery
+                        .toRegex(RegexOption.DOT_MATCHES_ALL)
                 } else {
                     searchParameters.searchQuery
                         .toRegex(setOf(RegexOption.DOT_MATCHES_ALL, RegexOption.IGNORE_CASE))
                 }
                 regex.matches(stringToCheck)
             } else {
-                stringToCheck.contains(searchParameters.searchQuery, !searchParameters.caseSensitive)
+                var searchFound = true
+                searchParameters.searchQuery.split(" ").forEach { word ->
+                    searchFound = searchFound
+                            && stringToCheck.contains(word, !searchParameters.caseSensitive)
+                }
+                searchFound
             }
         }
     }
diff --git a/fastlane/metadata/android/en-US/changelogs/106.txt b/fastlane/metadata/android/en-US/changelogs/106.txt
index 2bb58996f..7ee4d5576 100644
--- a/fastlane/metadata/android/en-US/changelogs/106.txt
+++ b/fastlane/metadata/android/en-US/changelogs/106.txt
@@ -4,4 +4,5 @@
  * Add editable chars fields #539
  * Better visualization of passwords #454 #1270
  * Passphrase implementation #218
- * Fix small bugs #1282
\ No newline at end of file
+ * Fix small bugs #1282
+ * Better search implementation #175
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/105.txt b/fastlane/metadata/android/fr-FR/changelogs/105.txt
index 5d7fe347c..c7cbeed8e 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/105.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/105.txt
@@ -3,4 +3,5 @@
  * Ajouter un avertissement pour informer de l'utilisation de KeyStore #1269
  * Déblocage par empreinte n'est plus par défaut #1273
  * Onglets pour afficher séparément le contenu principal et le contenu avancé
- * Correction de couleur d'URL
\ No newline at end of file
+ * Correction de couleur d'URL
+ * Meilleure implémentation de la recherche #175
\ No newline at end of file