diff --git a/nateman/templates/klausuren/stufe.html.j2 b/nateman/templates/klausuren/stufe.html.j2
index 6011a8f..37093a4 100644
--- a/nateman/templates/klausuren/stufe.html.j2
+++ b/nateman/templates/klausuren/stufe.html.j2
@@ -60,7 +60,10 @@
     {% endif %}
 
     {% for date in dates_list %}
-      {% set date_klausur_list = Klausur.query.filter_by(stufe=stufe, date=date).all() %}
+      {%
+        set date_klausur_list = Klausur.query.filter_by(stufe=stufe, date=date)
+        .order_by(Klausur.startperiod, Klausur.endperiod, Klausur.kursname).all()
+      %}
       {% set date_iso = date.strftime('%Y-%m-%d') %}
 
       <h3>