diff --git a/packages/docusaurus-theme-search-algolia/src/index.js b/packages/docusaurus-theme-search-algolia/src/index.js
index 186857bd608c..ffc015b67600 100644
--- a/packages/docusaurus-theme-search-algolia/src/index.js
+++ b/packages/docusaurus-theme-search-algolia/src/index.js
@@ -59,8 +59,8 @@ function theme(context) {
           path.join(outDir, OPEN_SEARCH_FILENAME),
           renderOpenSearchTemplate({
             title,
-            url,
-            favicon: normalizeUrl([url, favicon]),
+            url: url + baseUrl,
+            favicon: normalizeUrl([url, baseUrl, favicon]),
           }),
         );
       } catch (err) {
diff --git a/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js b/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
index adb802ee7e8d..1284223c7d47 100644
--- a/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
+++ b/packages/docusaurus-theme-search-algolia/src/templates/opensearch.js
@@ -13,8 +13,8 @@ module.exports = `
   <Description>Search <%= it.title %></Description>
   <InputEncoding>UTF-8</InputEncoding>
   <Image width="16" height="16" type="image/x-icon"><%= it.favicon %></Image>
-  <Url type="text/html" method="get" template="<%= it.url %>/search?q={searchTerms}"/>
-  <Url type="application/opensearchdescription+xml" rel="self" template="<%= it.url %>/opensearch.xml" />
+  <Url type="text/html" method="get" template="<%= it.url %>search?q={searchTerms}"/>
+  <Url type="application/opensearchdescription+xml" rel="self" template="<%= it.url %>opensearch.xml" />
   <moz:SearchForm><%= it.url %></moz:SearchForm>
 </OpenSearchDescription>
 `;