diff --git a/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html b/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
index 6e53b78a8e..53cde82b59 100644
--- a/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
+++ b/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
@@ -4,7 +4,11 @@
 
 {% block content %}
     {% if form %}
-            {% include 'dynamic_search/search_results_subtemplate.html' %}
+        {% with 'get' as submit_method %}
+        {% with form_title as title %}
+            {% include 'appearance/generic_form_subtemplate.html' %}
+        {% endwith %}
+        {% endwith %}
     {% endif %}
     {% if query_string %}
         {% include 'appearance/generic_list_subtemplate.html' %}
diff --git a/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html b/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html
deleted file mode 100644
index daf4c2379c..0000000000
--- a/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% with 'get' as submit_method %}
-{% with form_title as title %}
-    {% include 'appearance/generic_form_subtemplate.html' %}
-{% endwith %}
-{% endwith %}
diff --git a/mayan/apps/dynamic_search/templatetags/search_tags.py b/mayan/apps/dynamic_search/templatetags/search_tags.py
index 57d4e29f34..6417bf157f 100644
--- a/mayan/apps/dynamic_search/templatetags/search_tags.py
+++ b/mayan/apps/dynamic_search/templatetags/search_tags.py
@@ -11,19 +11,6 @@ from ..settings import RECENT_COUNT
 register = Library()
 
 
-@register.inclusion_tag('dynamic_search/search_results_subtemplate.html', takes_context=True)
-def search_form(context):
-    context.update({
-        'form': SearchForm(initial={'q': context.get('query_string', {}).get('q'), 'source': 'sidebar'}),
-        'request': context['request'],
-        'form_action': reverse('search'),
-        'form_title': _('Search'),
-        'submit_label': _('Search'),
-        'submit_icon_famfam': 'zoom',
-    })
-    return context
-
-
 @register.inclusion_tag('appearance/generic_subtemplate.html', takes_context=True)
 def recent_searches_template(context):
     if not context['user'].is_anonymous():