diff --git a/public_html/media/css/post-view.css b/public_html/media/css/post-view.css
index 029b61df..8e5649a4 100644
--- a/public_html/media/css/post-view.css
+++ b/public_html/media/css/post-view.css
@@ -23,15 +23,26 @@ embed {
 	margin: 0;
 	padding: 0;
 }
+#sidebar .tags .tag-wrapper {
+	max-width: 100%;
+	position: relative;
+	display: inline-block;
+}
 #sidebar .tags li a {
+	padding-right: 2.75em;
+	box-sizing: border-box;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	white-space: nowrap;
 	display: inline-block;
-	max-width: 90%;
+	width: 100%;
 	vertical-align: text-bottom;
 }
 #sidebar .tags li .count {
-	padding-left: 0.5em;
+	position: absolute;
+	width: 2em;
+	right: 0;
+	top: 0;
 	color: silver;
 	vertical-align: text-bottom;
 }
diff --git a/src/Views/post/post-view.phtml b/src/Views/post/post-view.phtml
index 2f6399e5..5ceb02d7 100644
--- a/src/Views/post/post-view.phtml
+++ b/src/Views/post/post-view.phtml
@@ -75,12 +75,14 @@ $canEditAnything = count(array_filter($editPostPrivileges)) > 0;
 			<?php uasort($tags, function($a, $b) { return strnatcasecmp($a->getName(), $b->getName()); }) ?>
 			<?php foreach ($tags as $tag): ?>
 				<li title="<?= $tag->getName() ?>">
-					<a href="<?= Core::getRouter()->linkTo(
-						['PostController', 'listView'],
-						['query' => $tag->getName()]) ?>"
-						><?= $tag->getName() ?>
-					</a>
-					<span class="count"><?= TextHelper::useDecimalUnits($tag->getPostCount()) ?></span>
+					<div class="tag-wrapper">
+						<a href="<?= Core::getRouter()->linkTo(
+							['PostController', 'listView'],
+							['query' => $tag->getName()]) ?>"
+							><?= $tag->getName() ?>
+						</a>
+						<span class="count"><?= TextHelper::useDecimalUnits($tag->getPostCount()) ?></span>
+					</div>
 				</li>
 			<?php endforeach ?>
 		</ul>