diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py
index da6e219132..d79f3bd7b3 100644
--- a/mayan/apps/document_comments/apps.py
+++ b/mayan/apps/document_comments/apps.py
@@ -5,6 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from acls import ModelPermission
 from common import MayanAppConfig, menu_facet, menu_object, menu_sidebar
+from documents.search import document_page_search, document_search
 from navigation import SourceColumn
 from rest_api.classes import APIEndPoint
 
@@ -49,6 +50,15 @@ class DocumentCommentsApp(MayanAppConfig):
         )
         SourceColumn(source=Comment, label=_('Comment'), attribute='comment')
 
+        document_page_search.add_model_field(
+            field='document_version__document__comments__comment',
+            label=_('Comments')
+        )
+        document_search.add_model_field(
+            field='comments__comment',
+            label=_('Comments')
+        )
+
         menu_sidebar.bind_links(
             links=(link_comment_add,),
             sources=(