diff --git a/app/scodoc/sco_edit_apc.py b/app/scodoc/sco_edit_apc.py
index 94341cddf..00603ce3a 100644
--- a/app/scodoc/sco_edit_apc.py
+++ b/app/scodoc/sco_edit_apc.py
@@ -88,6 +88,7 @@ def html_edit_formation_apc(
             editable=editable,
             tag_editable=tag_editable,
             icons=icons,
+            UniteEns=UniteEns,
         ),
     ]
     for semestre_idx in semestre_ids:
diff --git a/app/templates/pn/form_ues.html b/app/templates/pn/form_ues.html
index 8b5172da1..1d795be2f 100644
--- a/app/templates/pn/form_ues.html
+++ b/app/templates/pn/form_ues.html
@@ -4,7 +4,7 @@
     {% for semestre_idx in semestre_ids %}
         <div class="formation_list_ues_sem">Semestre S{{semestre_idx}}</div>
         <ul class="apc_ue_list">
-            {% for ue in formation.ues.filter_by(semestre_idx=semestre_idx) %}
+            {% for ue in formation.ues.filter_by(semestre_idx=semestre_idx).order_by(UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme) %}
                 <li class="notes_ue_list">
                 {% if editable and not loop.first %}
                     <a href="{{ url_for('notes.ue_move',