diff --git a/templates/event/_kind20_picture.html.twig b/templates/event/_kind20_picture.html.twig
index 884d426..73a823f 100644
--- a/templates/event/_kind20_picture.html.twig
+++ b/templates/event/_kind20_picture.html.twig
@@ -47,7 +47,7 @@
     {% if hashtags|length > 0 %}
         <div class="tags">
             {% for hashtag in hashtags %}
-                <span class="tag">#{{ hashtag }}</span>
+                <a href="{{ path('forum_tag', {'tag': tag}) }}" class="tag">#{{ hashtag }}</a>
             {% endfor %}
         </div>
     {% endif %}
diff --git a/templates/pages/article.html.twig b/templates/pages/article.html.twig
index 49acad5..ed6b4ae 100644
--- a/templates/pages/article.html.twig
+++ b/templates/pages/article.html.twig
@@ -104,7 +104,7 @@
             <hr class="divider" />
             <div class="tags">
                 {% for tag in article.topics %}
-                    <span class="tag">{{ tag }}</span>
+                    <a href="{{ path('forum_tag', {'tag': tag}) }}" class="tag">#{{ tag }}</a>
                 {% endfor %}
             </div>
             {% endif %}