diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 524eb5f..8543967 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,10 +1,6 @@
 <div class="clearfix">
 	<div class="tags pull-left">
-		{{{each tags}}}
-		<a href="{config.relative_path}/tags/{tags.value}">
-		<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span>
-		<span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
-		{{{end}}}
+		<!-- IMPORT partials/topic/tags.tpl -->
 	</div>
 
 	<!-- IMPORT partials/topic/browsing-users.tpl -->
diff --git a/templates/partials/topic/tags.tpl b/templates/partials/topic/tags.tpl
new file mode 100644
index 0000000..79a7b7d
--- /dev/null
+++ b/templates/partials/topic/tags.tpl
@@ -0,0 +1,6 @@
+{{{each tags}}}
+<a href="{config.relative_path}/tags/{tags.value}">
+    <span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span>
+    <span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span>
+</a>
+{{{end}}}
\ No newline at end of file