diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 7948886271..35787d1fa9 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -46,9 +46,12 @@
                 {% block header_right %}
                 {% if request.user.is_authenticated %}
                 <div class="fright">
+
+                {% block top_search %}
                 {% if has_file_search %}
                     {% include 'snippets/search_form.html' %}
                 {% endif %}
+                {% endblock %}
 
 
                 <div id="account" class="fright">
diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index 8847fd3496..9a49f99259 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block top_search %}{% endblock %} {# no 'file search' for system admin pages #}
+
 {% block admin_link %}
     <a href="{{ SITE_ROOT }}" title="{% trans "Exit admin panel" %}" class="item">{% trans "Exit admin panel" %}</a>
 {% endblock %}