diff --git a/lib/documentmanagement/documentutil.inc.php b/lib/documentmanagement/documentutil.inc.php
index f7b56d4..e5a8c22 100644
--- a/lib/documentmanagement/documentutil.inc.php
+++ b/lib/documentmanagement/documentutil.inc.php
@@ -511,7 +511,9 @@ class KTDocumentUtil {
             $aFieldValues[] = $oFieldLink->getValue();
         }
         $sAllFieldText = join(" ", $aFieldValues);
-        $sSearchableText = $sAllDocumentText . " " . $sAllFieldText . " " . $sAllComments;
+        $sDocumentFilename = $oDocument->getFilename();
+        $sDocumentTitle = $oDocument->getName();
+        $sSearchableText = $sAllDocumentText . " " . $sAllFieldText . " " . $sAllComments . " " . $sDocumentFilename . " " . $sDocumentTitle;
         $sTable = KTUtil::getTableName('document_searchable_text');
         $aInsert = array(
             "document_id" => $iDocumentId,