diff --git a/readthedocs/restapi/utils.py b/readthedocs/restapi/utils.py
index 43197d98d2f..d61cac07f7e 100644
--- a/readthedocs/restapi/utils.py
+++ b/readthedocs/restapi/utils.py
@@ -114,7 +114,7 @@ def index_search_request(
             'lang': project.language,
             'author': [user.username for user in project.users.all()],
             'url': project.get_absolute_url(),
-            'tags': None,
+            'tags': list(project.tags.slugs()) or None,
             'weight': project_scale,
         })
 
diff --git a/readthedocs/search/lib.py b/readthedocs/search/lib.py
index 8500a829b03..3ca9c756f71 100644
--- a/readthedocs/search/lib.py
+++ b/readthedocs/search/lib.py
@@ -22,6 +22,7 @@ def search_project(request, query, language=None):
                 "should": [
                     {"match": {"name": {"query": query, "boost": 10}}},
                     {"match": {"description": {"query": query}}},
+                    {"match": {"tags": {"query": query}}},
                 ]
             },
         },