diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index 8fb7a60..d55f71a 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -37,12 +37,14 @@ echo $this->data['nav']->render(); ?>
                         <article>
                             <?= Markdown::parse(\substr($doc->docRaw, 0, 500)); ?>
                         </article>
+                        <div class="tag-list">
                         <?php foreach ($doc->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">
                         <a href="<?= $url; ?>" class="button rf"><?= $this->getHtml('More', '0', '0'); ?></a>
diff --git a/Theme/Backend/wiki-doc-view.tpl.php b/Theme/Backend/wiki-doc-view.tpl.php
index ff85716..c6160f8 100644
--- a/Theme/Backend/wiki-doc-view.tpl.php
+++ b/Theme/Backend/wiki-doc-view.tpl.php
@@ -38,12 +38,14 @@ echo $this->data['nav']->render();
             <div class="portlet-body">
                 <article><?= $doc->doc; ?></article>
 
+                <div class="tag-list">
                 <?php foreach ($doc->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>
 
                 <?php $files = $doc->files; foreach ($files as $file) : ?>
                         <span><a class="content" href="<?= UriFactory::build('{/base}/media/view?id=' . $file->id);?>"><?= $file->name; ?></a></span>