diff --git a/blueprints/admin.py b/blueprints/admin.py
index e8a08e8..c3e666e 100644
--- a/blueprints/admin.py
+++ b/blueprints/admin.py
@@ -334,9 +334,10 @@ def admin_new() -> _Response:
             default_visibility=default_visibility,
             visibility=ap.Visibility,
             emojis=config.EMOJIS.split(" "),
-            custom_emojis={
-                name: ap.Emoji(**dat) for name, dat in EMOJIS_BY_NAME.items()
-            },
+            custom_emojis=sorted(
+                [ap.Emoji(**dat) for name, dat in EMOJIS_BY_NAME.items()],
+                key=lambda e: e.name,
+            ),
         )
     )
 
diff --git a/templates/new.html b/templates/new.html
index fa74059..34c61e1 100644
--- a/templates/new.html
+++ b/templates/new.html
@@ -35,7 +35,7 @@
 {% for emoji in emojis %}
 <span class="ji">{{ emoji | emojify | safe }}</span>
 {% endfor %}
-{% for emoji in custom_emojis.values() %}
+{% for emoji in custom_emojis %}
 <span class="ji"><img src="{{emoji.get_icon_url()}}" alt="{{emoji.name}}" title="{{emoji.name}}" class="custom-emoji"></span>
 {% endfor %}
 </p>