diff --git a/netbox/extras/search.py b/netbox/extras/search.py
index 9203b9144..feb235c29 100644
--- a/netbox/extras/search.py
+++ b/netbox/extras/search.py
@@ -24,6 +24,17 @@ class JournalEntryIndex(SearchIndex):
     display_attrs = ('kind', 'created_by')
 
 
+@register_search
+class TagIndex(SearchIndex):
+    model = models.Tag
+    fields = (
+        ('name', 100),
+        ('slug', 110),
+        ('description', 500),
+    )
+    display_attrs = ('description',)
+
+
 @register_search
 class WebhookEntryIndex(SearchIndex):
     model = models.Webhook