diff --git a/theme/templates/_sidebar.html b/theme/templates/_sidebar.html
index 9ac85cb..b3f46d5 100644
--- a/theme/templates/_sidebar.html
+++ b/theme/templates/_sidebar.html
@@ -39,7 +39,7 @@ <h1>Categories</h1>
             <h1>Tags</h1>
         </header>
         <div class="sidebar-tags">
-        {% for tag, article in tags %}
+        {% for tag, article in tags|sort %}
             <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
         {% endfor %}
         </div>
diff --git a/theme/templates/tags.html b/theme/templates/tags.html
index 5c2b340..84b7f38 100644
--- a/theme/templates/tags.html
+++ b/theme/templates/tags.html
@@ -9,7 +9,7 @@
     <h1>Blog tags</h1>
 
     <ul>
-        {% for tag, articles in tags %}
+        {% for tag, articles in tags|sort %}
         <li>
             <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag.name }}</a>
             — {{ articles | length }}