diff --git a/src/routes/main.cr b/src/routes/main.cr
index 9218933..70b1334 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -138,12 +138,16 @@ struct MainRouter
     end
 
     get "/tags" do |env|
-      tags = Storage.default.list_tags
-      encoded_tags = tags.map do |t|
-        URI.encode_www_form t, space_to_plus: false
+      tags = Storage.default.list_tags.map do |tag|
+        {
+          tag:         tag,
+          encoded_tag: URI.encode_www_form(tag, space_to_plus: false),
+          count:       Storage.default.get_tag_titles(tag).size,
+        }
       end
-      counts = tags.map do |t|
-        Storage.default.get_tag_titles(t).size
+      # Sort by :count reversly, and then sort by :tag
+      tags.sort! do |a, b|
+        (b[:count] <=> a[:count]).or(a[:tag] <=> b[:tag])
       end
 
       layout "tags"
diff --git a/src/views/tags.html.ecr b/src/views/tags.html.ecr
index 21fc3cc..dcf4de7 100644
--- a/src/views/tags.html.ecr
+++ b/src/views/tags.html.ecr
@@ -1,8 +1,8 @@
 <h2 class=uk-title>Tags</h2>
 <p class="uk-text-meta"><%= tags.size %> <%= tags.size > 1 ? "tags" : "tag" %> found</p>
 
-<% tags.zip(encoded_tags, counts).each do |tag, encoded, count| %>
+<% tags.each  do |tag| %>
   <span class="uk-label uk-label-primary" style="padding:2px 5px; margin:0 5px 5px 5px; text-transform:none;">
-    <a class="uk-link-reset" href="<%= base_url %>tags/<%= encoded %>"><%= tag %> (<%= count %> <%= count > 1 ? "titles" : "title" %>)</a>
+    <a class="uk-link-reset" href="<%= base_url %>tags/<%= tag[:encoded_tag] %>"><%= tag[:tag] %> (<%= tag[:count] %> <%= tag[:count] > 1 ? "titles" : "title" %>)</a>
   </span>
 <% end %>