diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
index 206d2763d..a0d470c22 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.ContentManagement;
@@ -46,6 +47,9 @@ namespace Orchard.Tags.Handlers {
                 }
 
             });
+
+            OnIndexing<TagsPart>((context, tagsPart) => context.DocumentIndex
+                                                    .Add("tags", String.Join(", ", tagsPart.CurrentTags.Select(t => t.TagName))).Analyze());
         }
     }
 }
\ No newline at end of file