diff --git a/_includes/scripts.liquid b/_includes/scripts.liquid
index aa607f83455c..2e602348835f 100644
--- a/_includes/scripts.liquid
+++ b/_includes/scripts.liquid
@@ -364,7 +364,9 @@
     </div>
   </ninja-keys>
   <script src="{{ '/assets/js/search-setup.js' | relative_url | bust_file_cache }}"></script>
-  <script src="{% if site.active_lang != site.default_lang %}{{ '/assets/js/search-data.js' | prepend: site.active_lang | relative_url }}{% else %}{{ '/assets/js/search-data.js' | relative_url }}{% endif %}"></script>
+  <script
+    src="{% if site.active_lang != site.default_lang %}{{ '/assets/js/search-data.js' | prepend: site.active_lang | relative_url }}{% else %}{{ '/assets/js/search-data.js' | relative_url }}{% endif %}"
+  ></script>
   <script src="{{ '/assets/js/shortcut-key.js' | relative_url | bust_file_cache }}"></script>
 {% endif %}
 
diff --git a/_scripts/search.liquid.js b/_scripts/search.liquid.js
index 3c7140cb411a..a8593fd7f723 100644
--- a/_scripts/search.liquid.js
+++ b/_scripts/search.liquid.js
@@ -6,6 +6,16 @@ permalink: /assets/js/search-data.js
 {% else %}
 {% assign lang = site.active_lang %}
 {% endif %}
+const currentUrl = window.location.href;
+const siteUrl = "{{ site.url }}"; 
+let updatedUrl = currentUrl.replace("{{ site.url }}{{ site.baseurl }}", "");
+if (currentUrl.length == updatedUrl.length && currentUrl.startsWith("http://127.0.0.1")) {
+  const otherSiteUrl = siteUrl.replace("localhost", "127.0.0.1");
+  updatedUrl = currentUrl.replace(otherSiteUrl + "{{ site.baseurl }}", "");
+}
+if ("{{ lang }}".length > 0) {
+  updatedUrl = updatedUrl.replace("/{{ lang }}", "");
+}
 // get the ninja-keys element
 const ninja = document.querySelector('ninja-keys');
 
@@ -307,7 +317,7 @@ ninja.data = [
           title: '{{ l }}',
           section: '{{ site.data[site.active_lang].strings.search.languages }}',
           handler: () => {
-            window.location.href = "{{ site.baseurl }}{{ page.url }}";
+            window.location.href = "{{ site.baseurl }}" + updatedUrl;
           },
         },
       {%- else -%}
@@ -316,7 +326,7 @@ ninja.data = [
           title: '{{ l }}',
           section: '{{ site.data[site.active_lang].strings.search.languages }}',
           handler: () => {
-            window.location.href = "{{ site.baseurl }}/{{ l }}{{ page.url }}";
+            window.location.href = "{{ site.baseurl }}/{{ l }}" + updatedUrl;
           },
         },
       {%- endif -%}