diff --git a/brutaldon/templates/main/emoji.html b/brutaldon/templates/main/emoji.html
index 80da6c1..80831f4 100644
--- a/brutaldon/templates/main/emoji.html
+++ b/brutaldon/templates/main/emoji.html
@@ -14,7 +14,7 @@
     <section>
         <div class="columns is-9 is-variable is-centered is-multiline">
             {% for emojo in emojos  %}
-                <div class="column is-one-quarter">
+                <div class="column is-one-fifth">
                     <p class="level emoji-box">
                         <img alt="" class="level-item emoji" src="{{ emojo.url }}">
                         <span class="level-item">:{{ emojo.shortcode }}:</span>
diff --git a/brutaldon/views.py b/brutaldon/views.py
index 5271993..552f28c 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -579,5 +579,5 @@ def emoji_reference(request):
     emojos = mastodon.custom_emojis()
     return render(request, 'main/emoji.html',
                       {"fullbrutalism": fullbrutalism_p(request),
-                       "emojos": emojos,
+                       "emojos": sorted(emojos, key=lambda x: x['shortcode']),
                        'own_acct' : request.session['user']})