diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 9a5c911f..031020d5 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -247,6 +247,13 @@ BacklogDirective = ($repo) ->
             target.toggleClass("active")
             toggleText(target.find(".text"), ["Hide Filters", "Show Filters"]) # TODO: i18n
 
+        $el.on "click", "#show-tags", (event) ->
+            event.preventDefault()
+            target = angular.element(event.currentTarget)
+            $el.find(".user-story-tags").toggle()
+            target.toggleClass("active")
+            toggleText(target.find(".text"), ["Hide Tags", "Show Tags"]) # TODO: i18n
+
         $el.on "click", "section.filters a.single-filter", (event) ->
             event.preventDefault()
             target = angular.element(event.currentTarget)
diff --git a/app/partials/backlog.jade b/app/partials/backlog.jade
index 78b634de..c629cb96 100644
--- a/app/partials/backlog.jade
+++ b/app/partials/backlog.jade
@@ -18,7 +18,7 @@ block content
                 a.trans-button(href="", title="Show Filters", id="show-filters-button")
                     span.icon.icon-filter
                     span.text Show Filters
-                a.trans-button(href="", title="Show Tags")
+                a.trans-button(href="", title="Show Tags", id="show-tags")
                     span.icon.icon-tag
                     span.text Show Tags
             include views/components/addnewus
diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade
index 6584d786..95d49631 100644
--- a/app/partials/views/components/backlog-row.jade
+++ b/app/partials/views/components/backlog-row.jade
@@ -7,8 +7,8 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories track by us.id")
                 a.icon.icon-edit(href="", ng-click="ctrl.editUserStory(us)", title="Edit")
                 a.icon.icon-delete(href="", ng-click="ctrl.deleteUserStory(us)", title="Delete")
         div.user-story-tags
-            span.tag Tag name
-            span.tag Tag name
+            span.tag(ng-repeat="tag in us.tags")
+                {{ tag }}
     div.status Status
     div.points 12
     div.points 54