diff --git a/aleksis/apps/chronos/templates/chronos/groups.html b/aleksis/apps/chronos/templates/chronos/groups.html
index 4548c39da6198fe34a0b15ff1058b8ce78016c0e..3ccfc00c4f6789fe4878880179e837408601c6ba 100644
--- a/aleksis/apps/chronos/templates/chronos/groups.html
+++ b/aleksis/apps/chronos/templates/chronos/groups.html
@@ -1,5 +1,5 @@
 {% for group in groups %}
   <a href="{% url "timetable" "group" group.pk %}">
-    {{ group.short_name }}
+    {{ group.short_name }}{% if not forloop.last %},{% endif %}
   </a>
 {% endfor %}