diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
index e97f739a6..ea549b75c 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
@@ -33,7 +33,7 @@ namespace Orchard.Tags.Drivers {
 
         protected override DriverResult Display(TagsPart part, string displayType, dynamic shapeHelper) {
             return ContentShape("Parts_Tags_ShowTags",
-                            () => shapeHelper.Parts_Tags_ShowTags(Tags: part.CurrentTags));
+                            () => shapeHelper.Parts_Tags_ShowTags(Tags: part.CurrentTags.Select(x => new ShowTagViewModel { TagName = x })));
         }
 
         protected override DriverResult Editor(TagsPart part, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
index bf0eb5261..7fa76378f 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -91,6 +91,7 @@
     <Compile Include="ViewModels\TagsAdminCreateViewModel.cs" />
     <Compile Include="ViewModels\TagsAdminEditViewModel.cs" />
     <Compile Include="ViewModels\TagsAdminIndexViewModel.cs" />
+    <Compile Include="ViewModels\ShowTagsViewModel.cs" />
     <Compile Include="ViewModels\TagsSearchViewModel.cs" />
     <Compile Include="ViewModels\TagsIndexViewModel.cs" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/ShowTagsViewModel.cs b/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/ShowTagsViewModel.cs
new file mode 100644
index 000000000..75c660f5a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/ShowTagsViewModel.cs
@@ -0,0 +1,5 @@
+namespace Orchard.Tags.ViewModels {
+    public class ShowTagViewModel {
+        public string TagName { get; set; }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml
index 0300e0b57..1f0892ff1 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml
@@ -4,7 +4,7 @@
         if (tagsHtml.Any()) {
             tagsHtml.Add(new HtmlString(", "));
         }
-        tagsHtml.Add(Html.ActionLink((string)t, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t }, new { }));
+        tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { }));
     }
 }