diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs
index f739d7a8e..a63154956 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs
@@ -111,6 +111,24 @@ namespace Orchard.Tags.Controllers {
             return RedirectToAction("Index");
         }
 
+        [HttpPost]
+        public ActionResult Remove(int id, string returnUrl) {
+            if (!Services.Authorizer.Authorize(Permissions.ManageTags, T("Couldn't remove tag")))
+                return new HttpUnauthorizedResult();
+
+            Tag tag = _tagService.GetTag(id);
+
+            if (tag == null)
+                return new HttpNotFoundResult();
+
+            _tagService.DeleteTag(id);
+
+            if (!string.IsNullOrWhiteSpace(returnUrl))
+                return Redirect(returnUrl);
+
+            return RedirectToAction("Index");
+        }
+
         public ActionResult Search(int id) {
             Tag tag = _tagService.GetTag(id);
 
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
index f16c3fb52..46df12f8b 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
@@ -1,11 +1,13 @@
 @model Orchard.Tags.ViewModels.TagsAdminIndexViewModel
-
 @using Orchard.Tags.ViewModels;
+@using Orchard.Utility.Extensions;
+@{
+    Script.Require("ShapesBase");
+}
 
 <h1>@Html.TitleForPage(T("Manage Tags").ToString()) </h1>
-
+@using(Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
-
 	<fieldset class="bulk-actions">
         <label for="publishActions">@T("Actions:")</label>
         <select id="publishActions" name="@Html.NameOf(m => m.BulkAction)">
@@ -14,7 +16,6 @@
         </select>
         <button type="submit"name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
     </fieldset>
-
     <div class="manage">@Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
     <fieldset>
         <table class="items" summary="@T("This is a table of the tags in your application")" >
@@ -36,13 +37,15 @@
                     <input type="checkbox" value="true" name="@Html.NameOf(m => m.Tags[tagIndex].IsChecked)"/>
                 </td>
                 <td>
-                    @Html.ActionLink(Html.Encode(tagEntry.Tag.TagName), "Search", new {id = tagEntry.Tag.Id})
+                    @Html.ActionLink(tagEntry.Tag.TagName, "Edit", new {id = tagEntry.Tag.Id})
                 </td>
                 <td>
-                    @Html.ActionLink(T("Edit").ToString(), "Edit", new {id = tagEntry.Tag.Id})
+                    @Html.ActionLink(T("Edit").ToString(), "Edit", new {id = tagEntry.Tag.Id}) @T(" | ")
+                    <a href="@Url.Action("Remove", new {tagEntry.Tag.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
                 </td>
             </tr>
             tagIndex = tagIndex + 1;
 			}
         </table>
-    </fieldset>
\ No newline at end of file
+    </fieldset>
+}
\ No newline at end of file