diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 81cc0e70..1ed7300b 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -583,69 +583,11 @@ UsPointsDirective = ($repo) ->
     return {link: link}
 
 
-#############################################################################
-## User story status directive
-#############################################################################
-
-UsStatusDirective = ($repo) ->
-    selectionTemplate = _.template("""
-      <ul class="popover pop-status">
-          <% _.forEach(statuses, function(status) { %>
-          <li>
-              <a href="" class="status" title="<%- status.name %>" data-status-id="<%- status.id %>">
-                  <%- status.name %>
-              </a>
-          </li>
-          <% }); %>
-      </ul>
-    """)
-
-    updateUsStatus = ($el, us, usStatusById) ->
-        usStatusDom = $el.find(".us-status")
-        usStatusDom.text(usStatusById[us.status].name)
-        usStatusDom.css('color', usStatusById[us.status].color)
-
-    link = ($scope, $el, $attrs) ->
-        $ctrl = $el.controller()
-        us = $scope.$eval($attrs.tgUsStatus)
-
-        bindOnce $scope, "project", (project) ->
-            $el.append(selectionTemplate({ 'statuses':  project.us_statuses }))
-            updateUsStatus($el, us, $scope.usStatusById)
-
-        $el.on "click", ".us-status", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            $el.find(".pop-status").show()
-
-            body = angular.element("body")
-            body.one "click", (event) ->
-                $el.find(".popover").hide()
-
-        $el.on "click", ".status", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            target = angular.element(event.currentTarget)
-            us.status = target.data("status-id")
-            $el.find(".pop-status").hide()
-            updateUsStatus($el, us, $scope.usStatusById)
-
-            $scope.$apply () ->
-                $repo.save(us).then ->
-                    $ctrl.loadProjectStats()
-
-        $scope.$on "$destroy", ->
-            $el.off()
-
-    return {link: link}
-
-
 module = angular.module("taigaBacklog")
 module.directive("tgBacklog", ["$tgRepo", BacklogDirective])
 module.directive("tgBacklogSprint", ["$tgRepo", BacklogSprintDirective])
 module.directive("tgUsPoints", ["$tgRepo", UsPointsDirective])
 module.directive("tgUsRolePointsSelector", ["$rootScope", UsRolePointsSelectorDirective])
-module.directive("tgUsStatus", ["$tgRepo", UsStatusDirective])
 
 module.controller("BacklogController", [
     "$scope",
diff --git a/app/coffee/modules/common/directives.coffee b/app/coffee/modules/common/directives.coffee
index 8d0995bf..80994ab5 100644
--- a/app/coffee/modules/common/directives.coffee
+++ b/app/coffee/modules/common/directives.coffee
@@ -22,6 +22,7 @@
 taiga = @.taiga
 bindOnce = @.taiga.bindOnce
 
+
 DateRangeDirective = ->
     renderRange = ($el, first, second) ->
         initDate = moment(first).format("YYYY/MM/DD")
@@ -56,6 +57,7 @@ SprintProgressBarDirective = ->
 
     return {link: link}
 
+
 DateSelectorDirective =->
     link = ($scope, $el, $attrs, $model) ->
         picker = new Pikaday({field: $el[0]})
@@ -66,7 +68,76 @@ DateSelectorDirective =->
     }
 
 
+#############################################################################
+## User story status directive
+#############################################################################
+
+UsStatusDirective = ($repo) ->
+    ### Print the status of a US and a popover to change it.
+        - tg-us-status: The user story
+        - on-update: Method call after US is updated
+
+    Example:
+
+        div.status(tg-us-status="us" on-update="ctrl.loadSprintState()")
+            a.us-status(href="", title="Status Name")
+
+    NOTE: This directive need 'usStatusById' and 'project'.
+    ###
+    selectionTemplate = _.template("""
+      <ul class="popover pop-status">
+          <% _.forEach(statuses, function(status) { %>
+          <li>
+              <a href="" class="status" title="<%- status.name %>" data-status-id="<%- status.id %>">
+                  <%- status.name %>
+              </a>
+          </li>
+          <% }); %>
+      </ul>
+    """)
+
+    updateUsStatus = ($el, us, usStatusById) ->
+        usStatusDom = $el.find(".us-status")
+        usStatusDom.text(usStatusById[us.status].name)
+        usStatusDom.css('color', usStatusById[us.status].color)
+
+    link = ($scope, $el, $attrs) ->
+        $ctrl = $el.controller()
+        us = $scope.$eval($attrs.tgUsStatus)
+
+        taiga.bindOnce $scope, "project", (project) ->
+            $el.append(selectionTemplate({ 'statuses':  project.us_statuses }))
+            updateUsStatus($el, us, $scope.usStatusById)
+
+        $el.on "click", ".us-status", (event) ->
+            event.preventDefault()
+            event.stopPropagation()
+            $el.find(".pop-status").show()
+
+            body = angular.element("body")
+            body.one "click", (event) ->
+                $el.find(".popover").hide()
+
+        $el.on "click", ".status", (event) ->
+            event.preventDefault()
+            event.stopPropagation()
+            target = angular.element(event.currentTarget)
+            us.status = target.data("status-id")
+            $el.find(".pop-status").hide()
+            updateUsStatus($el, us, $scope.usStatusById)
+
+            $scope.$apply () ->
+                $repo.save(us).then ->
+                    $scope.$eval($attrs.onUpdate)
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+    return {link: link}
+
+
 module = angular.module("taigaCommon")
 module.directive("tgDateRange", DateRangeDirective)
 module.directive("tgSprintProgressbar", SprintProgressBarDirective)
 module.directive("tgDateSelector", DateSelectorDirective)
+module.directive("tgUsStatus", ["$tgRepo", UsStatusDirective])
diff --git a/app/coffee/modules/taskboard.coffee b/app/coffee/modules/taskboard.coffee
index 0c020f1b..d1cfec1d 100644
--- a/app/coffee/modules/taskboard.coffee
+++ b/app/coffee/modules/taskboard.coffee
@@ -137,71 +137,5 @@ TaskboardRowSizeFixer = ->
     return {link: link}
 
 
-#############################################################################
-## User story status directive
-#############################################################################
-
-TaskboardUsStatusDirective = ($repo) ->
-    # NOTE: This directive is similar to backlog.main.UsStatusDirective
-    selectionTemplate = _.template("""
-      <ul class="popover pop-status">
-          <% _.forEach(statuses, function(status) { %>
-          <li>
-              <a href="" class="status" title="<%- status.name %>" data-status-id="<%- status.id %>">
-                  <%- status.name %>
-              </a>
-          </li>
-          <% }); %>
-      </ul>
-    """)
-
-    updateUsStatus = ($el, us, usStatusById) ->
-        usStatusDom = $el.find(".us-status")
-        usStatusDom.text(usStatusById[us.status].name)
-        usStatusDom.css('color', usStatusById[us.status].color)
-
-    link = ($scope, $el, $attrs) ->
-        $ctrl = $el.controller()
-        us = $scope.$eval($attrs.tgTaskboardUsStatus)
-
-        taiga.bindOnce $scope, "project", (project) ->
-            $el.append(selectionTemplate({ 'statuses':  project.us_statuses }))
-            updateUsStatus($el, us, $scope.usStatusById)
-
-        $el.on "click", ".us-status", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            $el.find(".pop-status").show()
-
-            body = angular.element("body")
-            body.one "click", (event) ->
-                $el.find(".popover").hide()
-
-        $el.on "click", ".status", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            target = angular.element(event.currentTarget)
-            us.status = target.data("status-id")
-            $el.find(".pop-status").hide()
-            updateUsStatus($el, us, $scope.usStatusById)
-
-            $scope.$apply () ->
-                $repo.save(us).then ->
-                    $ctrl.loadSprintStats()
-
-        $scope.$on "$destroy", ->
-            $el.off()
-
-    return {link: link}
-
-
-#############################################################################
-## User story status directive
-#############################################################################
-
-TaskboardUsPointsDirective = ($repo) ->
-
-
 module.directive("tgTaskboard", TaskboardDirective)
 module.directive("tgTaskboardRowSizeFixer", TaskboardRowSizeFixer)
-module.directive("tgTaskboardUsStatus", ["$tgRepo", TaskboardUsStatusDirective])
diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade
index 532fb43c..b544064d 100644
--- a/app/partials/views/components/backlog-row.jade
+++ b/app/partials/views/components/backlog-row.jade
@@ -9,7 +9,7 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories track by us.id")
         div.user-story-tags
             span.tag(ng-repeat="tag in us.tags") {{ tag }}
 
-    div.status.width-2(tg-us-status="us")
+    div.status.width-2(tg-us-status="us" on-update="ctrl.loadProjectStats()")
        a.us-status(href="", title="Status Name")
 
     div.points(tg-us-points="us")
diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade
index 9c37622f..8d887ec4 100644
--- a/app/partials/views/modules/taskboard-table.jade
+++ b/app/partials/views/modules/taskboard-table.jade
@@ -12,7 +12,7 @@ div.taskboard-table
                     h3.us-title
                         span.us-ref(tg-bo-ref="us.ref")
                         span(ng-bind="us.subject")
-                    div.status(tg-taskboard-us-status="us")
+                    div.status(tg-us-status="us" on-update="ctrl.loadSprintState()")
                         a.us-status(href="", title="Status Name")
                     ul.points-list
                         li UX