diff --git a/Makefile b/Makefile
index a0ab70f0ffc1..8982723ad757 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,8 @@ generate:
 build:
 	@echo -e "\033[0;32mBUILD:\033[0m"
 	hugo
-	node ./scripts/build-search-index.js < ./public/search-data/index.json > ./public/search-index.json
-	rm -rf ./public/search-data
+	node ./scripts/build-search-index.js < ./public/docs/search-data/index.json > ./public/docs/search-index.json
+	rm -rf ./public/docs/search-data
 
 .PHONY: test
 test:
diff --git a/layouts/_default/search-data.json b/layouts/docs/search-data.json
similarity index 100%
rename from layouts/_default/search-data.json
rename to layouts/docs/search-data.json
diff --git a/layouts/_default/search.html b/layouts/docs/search.html
similarity index 100%
rename from layouts/_default/search.html
rename to layouts/docs/search.html
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 7ba66f83d89b..fb516626b9a1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -52,7 +52,7 @@
                         </button>
 
                         <div class="right-nav-block">
-                            <form id="search-form" action="/search/" method="get">
+                            <form id="search-form" action="/docs/search/" method="get">
                                 <input type="search" id="search-box" name="q" placeholder="Search..." autocomplete="off">
                                 <button class="button" type="submit"><i class="fas fa-search"></i></button>
                             </form>
diff --git a/static/js/search-worker.js b/static/js/search-worker.js
index e9f4f17de36a..34aef470a79b 100644
--- a/static/js/search-worker.js
+++ b/static/js/search-worker.js
@@ -6,7 +6,7 @@ var index;
 
 // Download the search index synchronously.
 var req = new XMLHttpRequest();
-req.open("GET", "/search-index.json", false /* async */);
+req.open("GET", "/docs/search-index.json", false /* async */);
 req.send();
 if (req.readyState === req.DONE && req.status === 200) {
     var data = JSON.parse(req.responseText);