diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html
index f2c880537..f50a2d78f 100644
--- a/sphinx/themes/agogo/layout.html
+++ b/sphinx/themes/agogo/layout.html
@@ -52,8 +52,6 @@
{%- endblock %}
diff --git a/sphinx/themes/basic/opensearch.xml b/sphinx/themes/basic/opensearch.xml
index 03875be49..a750b3041 100644
--- a/sphinx/themes/basic/opensearch.xml
+++ b/sphinx/themes/basic/opensearch.xml
@@ -4,7 +4,7 @@
{% trans docstitle=docstitle|e %}Search {{ docstitle }}{% endtrans %}
utf-8
+ template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}"/>
{{ docstitle|e }}
{% block extra %} {# Put e.g. an element here. #} {% endblock %}
diff --git a/sphinx/themes/basic/searchbox.html b/sphinx/themes/basic/searchbox.html
index 506877410..6feaa93e0 100644
--- a/sphinx/themes/basic/searchbox.html
+++ b/sphinx/themes/basic/searchbox.html
@@ -14,8 +14,6 @@