diff --git a/app/models/group.rb b/app/models/group.rb
index c6364dbbfe4..f33250410ec 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -150,7 +150,9 @@ class Group < ActiveRecord::Base
   scope :with_smtp_configured, -> { where(smtp_enabled: true) }
 
   scope :visible_groups, Proc.new { |user, order, opts|
-    groups = self.order(order || "groups.name ASC")
+    groups = self
+    groups = groups.order(order) if order
+    groups = groups.order("groups.name ASC") unless order&.include?("name")
 
     if !opts || !opts[:include_everyone]
       groups = groups.where("groups.id > 0")