diff --git a/tildes/tildes/templates/includes/topic_tags.jinja2 b/tildes/tildes/templates/includes/topic_tags.jinja2
index 894c3b2..574b002 100644
--- a/tildes/tildes/templates/includes/topic_tags.jinja2
+++ b/tildes/tildes/templates/includes/topic_tags.jinja2
@@ -1,11 +1,11 @@
 {# Copyright (c) 2018 Tildes contributors <code@tildes.net> #}
 {# SPDX-License-Identifier: AGPL-3.0-or-later #}
 
+{% from 'macros/topics.jinja2' import topic_tag %}
+
 <ul class="topic-tags">
   {% for tag in topic.tags %}
-    <li class="label label-topic-tag label-topic-tag-{{ tag.replace(' ', '_') }}">
-      <a href="/~{{ topic.group.path }}?tag={{ tag.replace(' ', '_') }}">{{ tag }}</a>
-    </li>
+    {{ topic_tag(tag, "/~"~topic.group.path~"?tag="~tag.replace(' ', '_')) }}
   {% else %}
     <li class="label label-topic-tag">No tags</li>
   {% endfor %}
diff --git a/tildes/tildes/templates/macros/topics.jinja2 b/tildes/tildes/templates/macros/topics.jinja2
index 5e3faaf..689d17a 100644
--- a/tildes/tildes/templates/macros/topics.jinja2
+++ b/tildes/tildes/templates/macros/topics.jinja2
@@ -40,13 +40,11 @@
       {% if topic.tags %}
         <ul class="topic-tags">
           {% for tag in topic.tags %}
-            <li class="label label-topic-tag label-topic-tag-{{ tag.replace(' ', '_') }}">
-              {% if request.matched_route.name in ('home', 'group') %}
-                <a href="{{ request.current_listing_normal_url({'tag': tag.replace(' ', '_')}) }}">{{ tag }}</a>
-              {% else %}
-                {{ tag }}
-              {% endif %}
-            </li>
+            {% if request.matched_route_name in ('home', 'group') %}
+              {{ topic_tag(tag, request.current_listing_normal_url({'tag': tag.replace(' ', '_')})) }}
+            {% else %}
+              {{ topic_tag(tag) }}
+            {% endif %}
           {% endfor %}
         </ul>
       {% endif %}
@@ -171,3 +169,13 @@
 
   {{ classes|join(' ') }}
 {% endmacro %}
+
+{% macro topic_tag(tag, link=None) %}
+  <li class="label label-topic-tag label-topic-tag-{{ tag.replace(' ', '_').replace('.', '-') }}">
+    {% if link %}
+      <a href="{{ link }}">{{ tag }}</a>
+    {% else %}
+      {{ tag }}
+    {% endif %}
+  </li>
+{% endmacro %}