diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index 7355282..b8617cb 100755
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -73,6 +73,7 @@ echo $this->data['nav']->render(); ?>
                                     <td data-label="<?= $this->getHtml('Title'); ?>">
                                         <a href="<?= $url; ?>"><?= \in_array($key, $this->data['unread']) ? '<strong>' : ''; ?><?= $this->printHtml($task->title); ?><?= \in_array($key, $this->data['unread']) ? '</strong>' : ''; ?></a>
                                     <td data-label="<?= $this->getHtml('Tag'); ?>">
+                                        <div class="tag-list">
                                         <?php foreach ($task->tags as $tag) : ?>
                                         <a href="<?= $url; ?>">
                                             <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
@@ -81,6 +82,7 @@ echo $this->data['nav']->render(); ?>
                                             </span>
                                         </a>
                                         <?php endforeach; ?>
+                                        </div>
                                     <td data-label="<?= $this->getHtml('Creator'); ?>">
                                         <a class="content" href="<?= UriFactory::build('{/base}/profile/view?{?}&for=' . $task->createdBy->id); ?>">
                                             <?= $this->printHtml($this->renderUserName(
@@ -147,6 +149,7 @@ echo $this->data['nav']->render(); ?>
                                     <td data-label="<?= $this->getHtml('Title'); ?>">
                                         <a href="<?= $url; ?>"><?= \in_array($key, $this->data['unread']) ? '<strong>' : ''; ?><?= $this->printHtml($task->title); ?><?= \in_array($key, $this->data['unread']) ? '</strong>' : ''; ?></a>
                                     <td data-label="<?= $this->getHtml('Tag'); ?>">
+                                        <div class="tag-list">
                                         <?php foreach ($task->tags as $tag) : ?>
                                         <a href="<?= $url; ?>">
                                             <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
@@ -155,6 +158,7 @@ echo $this->data['nav']->render(); ?>
                                             </span>
                                         </a>
                                         <?php endforeach; ?>
+                                        </div>
                                     <td><?php $responsibles = $task->getResponsible();
                                             foreach ($responsibles as $responsible) : ?>
                                             <a class="content" href="<?= UriFactory::build('{/base}/profile/view?for=' . $responsible->id); ?>">
diff --git a/Theme/Backend/task-list.tpl.php b/Theme/Backend/task-list.tpl.php
index 920c4f5..7fb1af7 100644
--- a/Theme/Backend/task-list.tpl.php
+++ b/Theme/Backend/task-list.tpl.php
@@ -68,6 +68,7 @@ echo $this->data['nav']->render(); ?>
                         <td data-label="<?= $this->getHtml('Title'); ?>">
                             <a href="<?= $url; ?>"><?= $this->printHtml($task->title); ?></a>
                         <td data-label="<?= $this->getHtml('Tag'); ?>">
+                            <div class="tag-list">
                             <?php foreach ($task->tags as $tag) : ?>
                             <a href="<?= $url; ?>">
                                 <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
@@ -76,6 +77,7 @@ echo $this->data['nav']->render(); ?>
                                 </span>
                             </a>
                             <?php endforeach; ?>
+                            </div>
                         <td data-label="<?= $this->getHtml('Creator'); ?>">
                             <a class="content" href="<?= UriFactory::build('{/base}/profile/view?{?}&for=' . $task->createdBy->id); ?>">
                                 <?= $this->printHtml($this->renderUserName(
diff --git a/Theme/Backend/task-view.tpl.php b/Theme/Backend/task-view.tpl.php
index 966703c..135143c 100644
--- a/Theme/Backend/task-view.tpl.php
+++ b/Theme/Backend/task-view.tpl.php
@@ -93,6 +93,7 @@ echo $this->data['nav']->render(); ?>
                                 data-tpl-value-path="/0/response/descriptionRaw"
                                 data-tpl-text-path="/0/response/description"
                                 data-value=""><?= $task->description; ?></article>
+                            <div class="tag-list">
                             <?php
                                 foreach ($task->tags as $tag) : ?>
                                 <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
@@ -100,6 +101,7 @@ echo $this->data['nav']->render(); ?>
                                     <?= $this->printHtml($tag->getL11n()); ?>
                                 </span>
                             <?php endforeach; ?>
+                            </div>
                             <?php if (!empty($taskMedia)) : ?>
                                 <div>
                                     <?php foreach ($taskMedia as $media) : ?>