diff --git a/app/models/group.rb b/app/models/group.rb
index ecfab9ec29b..90d6f063542 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -282,7 +282,9 @@ class Group < ActiveRecord::Base
   end
 
   def self.search_group(name)
-    Group.where(visible: true).where("name ILIKE :term_like", term_like: "#{name}%")
+    Group.where(visible: true).where(
+      "name ILIKE :term_like OR full_name ILIKE :term_like", term_like: "#{name}%"
+    )
   end
 
   def self.lookup_group(name)
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index b066566c113..8ec3348e459 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -487,4 +487,18 @@ describe Group do
       end
     end
   end
+
+  describe '.search_group' do
+    let(:group) { Fabricate(:group, name: 'tEsT', full_name: 'eSTt') }
+
+    it 'should return the right groups' do
+      group
+
+      expect(Group.search_group('te')).to eq([group])
+      expect(Group.search_group('TE')).to eq([group])
+      expect(Group.search_group('es')).to eq([group])
+      expect(Group.search_group('ES')).to eq([group])
+      expect(Group.search_group('test2')).to eq([])
+    end
+  end
 end