diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 55f543285..4f977915b 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -579,25 +579,6 @@ const Database* Entry::database() const
     }
 }
 
-bool Entry::match(const QString& searchTerm, Qt::CaseSensitivity caseSensitivity)
-{
-    QStringList wordList = searchTerm.split(QRegExp("\\s"), QString::SkipEmptyParts);
-    Q_FOREACH (const QString& word, wordList) {
-        if (!wordMatch(word, caseSensitivity)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool Entry::wordMatch(const QString& word, Qt::CaseSensitivity caseSensitivity)
-{
-    return title().contains(word, caseSensitivity) ||
-            username().contains(word, caseSensitivity) ||
-            url().contains(word, caseSensitivity) ||
-            notes().contains(word, caseSensitivity);
-}
-
 QString Entry::resolvePlaceholders(const QString& str) const
 {
     QString result = str;
diff --git a/src/core/Entry.h b/src/core/Entry.h
index c2c2938c1..ae07ed453 100644
--- a/src/core/Entry.h
+++ b/src/core/Entry.h
@@ -141,7 +141,6 @@ public:
     void setGroup(Group* group);
 
     void setUpdateTimeinfo(bool value);
-    bool match(const QString& searchTerm, Qt::CaseSensitivity caseSensitivity);
 
 Q_SIGNALS:
     /**
@@ -157,7 +156,6 @@ private Q_SLOTS:
     void updateModifiedSinceBegin();
 
 private:
-    bool wordMatch(const QString& word, Qt::CaseSensitivity caseSensitivity);
     const Database* database() const;
     template <class T> bool set(T& property, const T& value);
 
diff --git a/src/core/EntrySearcher.cpp b/src/core/EntrySearcher.cpp
index 60cfaea45..82a553e3a 100644
--- a/src/core/EntrySearcher.cpp
+++ b/src/core/EntrySearcher.cpp
@@ -28,14 +28,12 @@ QList<Entry*> EntrySearcher::search(const QString &searchTerm, const Group* grou
     return searchEntries(searchTerm, group, caseSensitivity);
 }
 
-QList<Entry*> EntrySearcher::searchEntries(const QString &searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity)
+QList<Entry*> EntrySearcher::searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity)
 {
     QList<Entry*> searchResult;
 
     Q_FOREACH (Entry* entry, group->entries()) {
-        if (entry->match(searchTerm, caseSensitivity)) {
-            searchResult.append(entry);
-        }
+        searchResult.append(matchEntry(searchTerm, entry, caseSensitivity));
     }
     Q_FOREACH (Group* childGroup, group->children()) {
         if (childGroup->searchingEnabled() != Group::Disable) {
@@ -45,3 +43,23 @@ QList<Entry*> EntrySearcher::searchEntries(const QString &searchTerm, const Grou
 
     return searchResult;
 }
+
+QList<Entry*> EntrySearcher::matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity)
+{
+    QStringList wordList = searchTerm.split(QRegExp("\\s"), QString::SkipEmptyParts);
+    Q_FOREACH (const QString& word, wordList) {
+        if (!wordMatch(word, entry, caseSensitivity)) {
+            return QList<Entry*>();
+        }
+    }
+
+    return QList<Entry*>() << entry;
+}
+
+bool EntrySearcher::wordMatch(const QString& word, Entry* entry, Qt::CaseSensitivity caseSensitivity)
+{
+    return entry->title().contains(word, caseSensitivity) ||
+            entry->username().contains(word, caseSensitivity) ||
+            entry->url().contains(word, caseSensitivity) ||
+            entry->notes().contains(word, caseSensitivity);
+}
diff --git a/src/core/EntrySearcher.h b/src/core/EntrySearcher.h
index 56ed7e4e5..246538cbe 100644
--- a/src/core/EntrySearcher.h
+++ b/src/core/EntrySearcher.h
@@ -29,7 +29,9 @@ class EntrySearcher
 public:
     QList<Entry*> search(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity);
 private:
-    QList<Entry*> searchEntries(const QString &searchTerm, const Group *group, Qt::CaseSensitivity caseSensitivity);
+    QList<Entry*> searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity);
+    QList<Entry*> matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity);
+    bool wordMatch(const QString &word, Entry *entry, Qt::CaseSensitivity caseSensitivity);
 };
 
 #endif // KEEPASSX_ENTRYSEARCHER_H