diff --git a/democracy_club/apps/hermes/admin.py b/democracy_club/apps/hermes/admin.py
index 97e06c2f..bbcb42ef 100644
--- a/democracy_club/apps/hermes/admin.py
+++ b/democracy_club/apps/hermes/admin.py
@@ -9,7 +9,7 @@ class PostAdmin(admin.ModelAdmin):
     filter_horizontal = ["author"]
     search_fields = ["subject"]
     search_help_text = "Search by subject (Post title)"
-    list_display = ["subject", "created_on", "category"]
+    list_display = ["subject", "created_on", "category", "tags"]
     list_filter = ["is_published", "author"]
 
 
diff --git a/democracy_club/templates/hermes/post_list.html b/democracy_club/templates/hermes/post_list.html
index 83c6c569..cdb26565 100644
--- a/democracy_club/templates/hermes/post_list.html
+++ b/democracy_club/templates/hermes/post_list.html
@@ -24,10 +24,12 @@ <h2 class="ds-h3"><a href="{{ post.get_absolute_url }}">{{ post.subject }}</a></
                     </address>
                     on <time pubdate datetime="{{post.modified_on|date:"c"}}" title="{{post.created_on|date:"jS E Y"}}">{{post.created_on|date:"jS E Y"}}</time>
                 </div>
-                <span aria-hidden="true">🏷️</span>
-                {% for tag in post.tags %}
-                    <a href="{% url 'hermes_post_list_by_tag' tag %}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                {% endfor %}
+                <div>
+                    <span aria-hidden="true">🏷️</span>
+                    {% for tag in post.tags %}
+                        <a href="{% url 'hermes_post_list_by_tag' tag %}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
+                    {% endfor %}
+                </div>
                 {{ post.rendered_summary|safe|typogrify }}
                 <a class="ds-cta ds-cta-blue" href="{{ post.get_absolute_url }}">Read more</a>
             </article>