diff --git a/ckanext/odsh/templates/package/search.html b/ckanext/odsh/templates/package/search.html
index 5d2a6ba077430ee4f7a51cec6316ddfa2f2f1546..61e64b6521b1ebef9b26185b6d30bab7b880770d 100644
--- a/ckanext/odsh/templates/package/search.html
+++ b/ckanext/odsh/templates/package/search.html
@@ -1,4 +1,5 @@
 {% ckan_extends %}
+{% import 'macros/form.html' as form %}
 
 {% block styles %}
   {{ super() }}
@@ -24,9 +25,11 @@ method="get" data-module="select-switch">
     <div class="module-content">
       {% block page_primary_action %}
       {% endblock %}
-      {% block form %}
-        {{ super() }}
-      {% endblock %}
+      <div class="search-form">
+        {% block form %}
+          {{ super() }}
+        {% endblock %}
+      </div>
       {% block package_search_results_list %}
         {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
       {% endblock %}
@@ -65,7 +68,6 @@ method="get" data-module="select-switch">
     <nav>
       <div class="nav-title">{{_('Period')}}</div>
       <div class="rangesearch-controls">
-          {% import 'macros/form.html' as form %}
           <div class='controls rangesearch' >
             {%- set start = request.args['ext_startdate'] -%}
             {%- set start_error = h.odsh_render_datetime(start, False) == '' and start -%}
@@ -118,5 +120,6 @@ method="get" data-module="select-switch">
 {% endblock %}
 
 {% block scripts %}
+  {{ super() }}
   {% asset 'ckanext-odsh/odsh_datepicker_script' %}
 {% endblock scripts %}