diff --git a/proposals/templates/proposals/talk_list.html b/proposals/templates/proposals/talk_list.html
index a311eb4..9f6d3b0 100644
--- a/proposals/templates/proposals/talk_list.html
+++ b/proposals/templates/proposals/talk_list.html
@@ -60,9 +60,7 @@
             </td>
             <td>
                 {% for topic in talk.topics.all %}
-                    {{ topic }}
-                    {% if forloop.revcounter == 2 %} {% trans "and" %} {% elif not forloop.last %}, {% endif %}
-                    {% empty %}–
+                    <span class="badge">{{ topic }}</span>
                 {% endfor %}
             </td>
             <td>{{ talk.track|default:"–" }}</td>