diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php
index 74ddfd5..e7e8a4c 100755
--- a/Theme/Backend/kanban-board.tpl.php
+++ b/Theme/Backend/kanban-board.tpl.php
@@ -43,12 +43,14 @@ $columns = $board->getColumns();
                 <div class="portlet-body">
                     <article><?= $card->description; ?></article>
 
+                    <div class="tag-list">
                     <?php foreach ($card->tags as $tag) : ?>
                         <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
                             <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                             <?= $this->printHtml($tag->getL11n()); ?>
                         </span>
                     <?php endforeach; ?>
+                    </div>
                 </div>
                 <div class="portlet-foot">
                     <div class="overflowfix">
diff --git a/Theme/Backend/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php
index f20305f..1046652 100755
--- a/Theme/Backend/kanban-dashboard.tpl.php
+++ b/Theme/Backend/kanban-dashboard.tpl.php
@@ -44,12 +44,14 @@ echo $this->data['nav']->render(); ?>
             </div>
             <div class="portlet-body">
                 <article><?= $board->description; ?></article>
+                <div class="tag-list">
                 <?php foreach ($board->tags as $tag) : ?>
                     <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
                         <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                         <?= $this->printHtml($tag->getL11n()); ?>
                     </span>
                 <?php endforeach; ?>
+                </div>
             </div>
             <div class="portlet-foot">
                  <div class="overflowfix">