diff --git a/app/assets/javascripts/favorite_groups.js b/app/assets/javascripts/favorite_groups.js
index 492b8c940..cd7706122 100644
--- a/app/assets/javascripts/favorite_groups.js
+++ b/app/assets/javascripts/favorite_groups.js
@@ -38,7 +38,7 @@
   }
 
   Danbooru.FavoriteGroup.add_to_favgroup = function(e) {
-    var favgroup_index = String.fromCharCode(e.which);
+    var favgroup_index = (e.key === "0") ? "10" : e.key;
     var link = $("#add-to-favgroup-" + favgroup_index + ":visible");
     if (link.length) {
       link.click();
diff --git a/app/models/favorite_group.rb b/app/models/favorite_group.rb
index d6a09f630..e9da9e762 100644
--- a/app/models/favorite_group.rb
+++ b/app/models/favorite_group.rb
@@ -42,7 +42,7 @@ class FavoriteGroup < ApplicationRecord
     end
 
     def default_order
-      order(updated_at: :desc)
+      order(name: :asc)
     end
 
     def search(params)
diff --git a/app/models/user.rb b/app/models/user.rb
index aa9dba5c6..c80895cd5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -104,6 +104,7 @@ class User < ApplicationRecord
   has_many :saved_searches
   has_many :forum_posts, lambda {order("forum_posts.created_at, forum_posts.id")}, :foreign_key => "creator_id"
   has_many :user_name_change_requests, lambda {visible.order("user_name_change_requests.created_at desc")}
+  has_many :favorite_groups, lambda {order(name: :asc)}, foreign_key: :creator_id
   belongs_to :inviter, class_name: "User", optional: true
   after_update :create_mod_action
   accepts_nested_attributes_for :dmail_filter
@@ -305,10 +306,6 @@ class User < ApplicationRecord
     def remove_favorite!(post)
       Favorite.remove(post: post, user: self)
     end
-
-    def favorite_groups
-      FavoriteGroup.for_creator(CurrentUser.user.id).order("updated_at desc")
-    end
   end
 
   module LevelMethods
@@ -753,7 +750,7 @@ class User < ApplicationRecord
     end
 
     def favorite_group_count
-      FavoriteGroup.for_creator(id).count
+      favorite_groups.count
     end
 
     def appeal_count