diff --git a/seahub/templates/pubgrp.html b/seahub/templates/pubgrp.html
index 43eafdfbc3..cb4c10a2a8 100644
--- a/seahub/templates/pubgrp.html
+++ b/seahub/templates/pubgrp.html
@@ -4,6 +4,14 @@
 
 {% block cur_grp %}tab-cur{% endblock %}
 
+{% block left_panel %}{{block.super}}
+{% if has_file_search %}
+<form action="{% url "pubgrp_search" %}" method="get" class="side-search-form">
+    <input type="text" name="search" value="{{search}}" placeholder="{% trans "Search groups..." %}" class="input" />
+</form>
+{% endif %}
+{% endblock %}
+
 {% block right_panel %}
 <h3 class="hd">{% trans "Groups" %}</h3>
 {% if groups %}
@@ -19,6 +27,12 @@
     </li>
     {% endfor %}
 </ul>
+
+{% elif is_search %}
+<div class="empty-tips">
+    <h2 class="alc">{% trans "No group found" %}</h2>
+</div>
+
 {% else %}
 <div class="empty-tips">
     <h2 class="alc">{% trans "No one has created any groups yet" %}</h2>
diff --git a/seahub/urls.py b/seahub/urls.py
index 0f553b94a4..30b7e0ce6e 100644
--- a/seahub/urls.py
+++ b/seahub/urls.py
@@ -212,10 +212,11 @@ if getattr(settings, 'CLOUD_MODE', False):
 
 from seahub.utils import HAS_FILE_SEARCH
 if HAS_FILE_SEARCH:
-    from seahub_extra.search.views import search, pubuser_search
+    from seahub_extra.search.views import search, pubuser_search, pubgrp_search
     urlpatterns += patterns('',
         url(r'^search/$', search, name='search'),
         url(r'^pubinfo/users/search/$', pubuser_search, name='pubuser_search'),
+        url(r'^pubinfo/groups/search/$', pubgrp_search, name='pubgrp_search'),
     )
 
 if getattr(settings, 'ENABLE_PAYMENT', False):