diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee
index 714e5ca9..612194b2 100644
--- a/app/coffee/modules/kanban/main.coffee
+++ b/app/coffee/modules/kanban/main.coffee
@@ -145,7 +145,7 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
                 if not usByStatus[status.id]?
                     usByStatus[status.id] = []
                 if @scope.usByStatus?
-                    for us in @scope.usByStatus[status.id]                        
+                    for us in @scope.usByStatus[status.id]
                         if us.status != status.id
                             us_archived.push(us)
 
@@ -439,7 +439,12 @@ KanbanUserstoryDirective = ($rootscope, $loading, $rs) ->
             $el.off()
 
     return {
-        templateUrl: "kanban/kanban-task.html"
+        #templateUrl: "kanban/kanban-task.html"
+        templateUrl: (elem, attr) ->
+            if attr.placeholder
+                return "common/components/card-placeholder.html"
+            else
+                return "kanban/kanban-task.html"
         link: link
         require: "ngModel"
     }
diff --git a/app/partials/includes/components/card-placeholder.jade b/app/partials/common/components/card-placeholder.jade
similarity index 100%
rename from app/partials/includes/components/card-placeholder.jade
rename to app/partials/common/components/card-placeholder.jade
diff --git a/app/partials/includes/modules/kanban-table.jade b/app/partials/includes/modules/kanban-table.jade
index 7082a0ce..2fae77f0 100644
--- a/app/partials/includes/modules/kanban-table.jade
+++ b/app/partials/includes/modules/kanban-table.jade
@@ -46,9 +46,14 @@ div.kanban-table(tg-kanban-squish-column)
                                             tg-kanban-column-height-fixer,
                                             tg-bind-scope)
 
-                div.kanban-task(ng-repeat="us in usByStatus[s.id] track by us.id",
-                                tg-kanban-userstory, ng-model="us", tg-bind-scope,
-                                tg-class-permission="{'readonly': '!modify_task'}"
-                                ng-class="ctrl.getCardClass(s.id)")
+                div.kanban-task(
+                    ng-repeat="us in usByStatus[s.id] track by us.id",
+                    tg-kanban-userstory, 
+                    ng-model="us", 
+                    tg-bind-scope,
+                    tg-class-permission="{'readonly': '!modify_task'}"
+                    ng-class="ctrl.getCardClass(s.id), 'card-placeholder': us.isPlaceholder}"
+                    placeholder="{{us.isPlaceholder}}"
+                )
 
                 div.kanban-column-intro(ng-if="s.is_archived", tg-kanban-archived-status-intro="s")
diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade
index 2b0f1476..05ff82fc 100644
--- a/app/partials/includes/modules/taskboard-table.jade
+++ b/app/partials/includes/modules/taskboard-table.jade
@@ -48,4 +48,4 @@ div.taskboard-table(tg-taskboard-squish-column)
                             include ../components/taskboard-task
                         
                         div(ng-if="task.isPlaceholder")
-                            include ../components/card-placeholder
+                            include ../../common/components/card-placeholder
diff --git a/app/partials/kanban/kanban-task.jade b/app/partials/kanban/kanban-task.jade
index 177e9b28..a63842bc 100644
--- a/app/partials/kanban/kanban-task.jade
+++ b/app/partials/kanban/kanban-task.jade
@@ -1,7 +1,9 @@
-div(ng-show="us.isPlaceholder") TODO PLACEHOLDER
-
-div.kanban-tagline(ng-show="!us.isPlaceholder", tg-colorize-tags="us.tags", tg-colorize-tags-type="kanban", ng-hide="us.isArchived")
-div.kanban-task-inner(ng-show="!us.isPlaceholder", ng-class="{'task-archived': us.isArchived}")
+div.kanban-tagline(
+    tg-colorize-tags="us.tags"
+    tg-colorize-tags-type="kanban"
+    ng-hide="us.isArchived"
+)
+div.kanban-task-inner(ng-class="{'task-archived': us.isArchived}")
     div.avatar-wrapper(tg-kanban-user-avatar="us.assigned_to", ng-model="us", ng-hide="us.isArchived")
     div.task-text(ng-hide="us.isArchived")
         a.task-assigned(href="", title="{{'US.ASSIGN' | translate}}")