diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index 7bf773bd82e..01e879a4a90 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -47,6 +47,7 @@
   {% block package_search_results_api %}
   <section class="module">
     <div class="module-content">
+      {% block package_search_results_api_inner %}
       <small>
         {% set api_link = h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=3)) %}
         {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/en/{0}/api.html'.format(g.ckan_doc_version)) %}
@@ -61,6 +62,7 @@
           {% endtrans %}
         {%- endif %}
       </small>
+      {% endblock %}
     </div>
   </section>
   {% endblock %}
diff --git a/ckan/templates/snippets/search_form.html b/ckan/templates/snippets/search_form.html
index 6fdd9e1638e..0164769444e 100644
--- a/ckan/templates/snippets/search_form.html
+++ b/ckan/templates/snippets/search_form.html
@@ -9,10 +9,12 @@
   {% block search_input %}
     <div class="search-input control-group {{ search_class }}">
       <input type="text" class="search" name="q" value="{{ query }}" autocomplete="off" placeholder="{{ placeholder }}">
+      {% block search_input_button %}
       <button type="submit" value="search">
         <i class="icon-search"></i>
         <span>{{ _('Submit') }}</span>
       </button>
+      {% endblock %}
     </div>
   {% endblock %}
 
@@ -33,7 +35,9 @@
             {% endif %}
           {% endfor %}
         </select>
+        {% block search_sortby_button %}
         <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
+        {% endblock %}
       </div>
     {% endif %}
   {% endblock %}