diff --git a/assets/js/search.js b/assets/js/search.js
index 3d6e9d9447..5c25d8af1f 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -23,8 +23,7 @@ limitations under the License.
           }
 
           var query = $(this).val();
-          var searchPage = "{{ "docs/search/" | absURL }}?q=" + query;
-          document.location = searchPage;
+          document.location = "{{ "search/" | absURL }}?q=" + query;
 
           return false;
         });
diff --git a/content/en/docs/search.md b/content/en/search.md
similarity index 100%
rename from content/en/docs/search.md
rename to content/en/search.md
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
new file mode 100644
index 0000000000..32c93338cf
--- /dev/null
+++ b/layouts/_default/search.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<html lang="{{ .Site.Language.Lang }}" class="{{.Params.class}} no-js">
+  <head>
+    {{ partial "head.html" . }}
+  </head>
+  <body class="td-{{ .Kind }}{{- if ne .Params.cid "" -}}{{- printf " cid-%s" (lower .Params.cid) -}}{{- end -}}">
+    <header>
+      {{ partial "navbar.html" . }}
+    </header>
+    {{ block "announcement" . }}
+      {{ if .IsHome }}
+        {{ partial "frontpage-announcement.html" . }}
+      {{ else }}
+        {{ partial "announcement.html" . }}
+      {{ end }}
+    {{ end }}
+    <div class="td-outer">
+      <main role="main" class="td-main">
+		<section class="row td-search-result">
+	      <div class="col-12 col-md-4 offset-md-2">
+		    <form class="td-sidebar__search d-flex align-items-center">
+		    {{ partial "search-input.html" . }}
+		    <button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
+		    </button>
+			</form>
+		  </div>
+		  <div class="col-12 col-md-8 offset-md-2">
+	        <h2 class="ml-4">{{ .Title }}</h2>
+			{{ if .Site.Params.gcs_engine_id }}
+			<script>
+		    (function() {
+		    var cx = '{{ . }}';
+		    var gcse = document.createElement('script');
+		    gcse.type = 'text/javascript';
+		    gcse.async = true;
+		    gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
+		    var s = document.getElementsByTagName('script')[0];
+		    s.parentNode.insertBefore(gcse, s);
+		    })();
+	        </script>
+	        <gcse:searchresults-only></gcse:searchresults-only>
+	        {{ else if .Site.Params.k8s_search }}
+		    <script src="{{ "js/search.js" | relURL }}"></script>
+		    <gcse:searchresults-only linktarget="_parent">
+		    <div id="bing-results-container">{{ T "layouts_docs_search_fetching" }}</div>
+		    <div id="bing-pagination-container"></div>
+		    </gcse:searchresults-only>
+	        {{ end }}
+		  </div>
+		</section>
+      </main>
+    {{ partial "footer.html" . }}
+    </div>
+    {{ partialCached "scripts.html" . }}
+  </body>
+</html>
diff --git a/layouts/docs/search.html b/layouts/docs/search.html
deleted file mode 100644
index aeb918566e..0000000000
--- a/layouts/docs/search.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{{ define "main" }}
-<section class="row td-search-result">
-<div class="col-12 col-md-8 offset-md-2">
-<h2 class="ml-4">{{ .Title }}</h2>
-{{ if .Site.Params.gcs_engine_id }}
-	<script>
-		(function() {
-		var cx = '{{ . }}';
-		var gcse = document.createElement('script');
-		gcse.type = 'text/javascript';
-		gcse.async = true;
-		gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
-		var s = document.getElementsByTagName('script')[0];
-		s.parentNode.insertBefore(gcse, s);
-		})();
-	</script>
-	<gcse:searchresults-only></gcse:searchresults-only>
-{{ else if .Site.Params.k8s_search }}
-<script src="{{ "js/search.js" | relURL }}"></script>
-	<gcse:searchresults-only linktarget="_parent">
-		<div id="bing-results-container">{{ T "layouts_docs_search_fetching" }}</div>
-		<div id="bing-pagination-container"></div>
-	</gcse:searchresults-only>
-{{ end }}
-</div>
-</section>
-{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/docs/top-menu.html b/layouts/partials/docs/top-menu.html
deleted file mode 100644
index c1654dbcd1..0000000000
--- a/layouts/partials/docs/top-menu.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{{ $p := . }}
-{{ $home := site.Home }}
-{{ $docs := site.GetPage "section" "docs" }}
-{{ $menuSections := (where $docs.Sections ".Params.main_menu" true) }}
-{{ range $menuSections }}
-{{ if $p.IsDescendant . }}
-<h1>{{ if not (strings.Contains .Path "home")}}{{ .Params.bigheader | default .Title }}{{ end }}</h1>
-<h5>{{ .Params.abstract }}</h5>
-{{ end }}
-{{ end }}
-<div id="vendorStrip" class="light-text">
-	<ul>
-		{{ range $menuSections }}
-		{{ $yah := $p.IsDescendant . }}
-		<li><a href="{{ .RelPermalink }}"{{ if $yah }} class="YAH"{{ end }} data-proofer-ignore>{{ .LinkTitle | upper }}</a></li>
-		{{ end }}
-	</ul>
-	<form id="searchBox" action="/docs/search/" role="search">
-		<input type="text" id="search" name="q" placeholder="{{ T "ui_search_placeholder" }}" aria-label="Search">
-	</form>
-</div>
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 47f6e92daf..fa71b6a700 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -58,7 +58,7 @@
 {{- if not .Site.Params.deprecated }}
     "potentialAction": {
       "@type": "SearchAction",
-      "target": {{ printf "%s%s" ("/docs/search/" | absURL) "?q={search_term_string}" }},
+      "target": {{ printf "%s%s" ("search/" | absURL) "?q={search_term_string}" }},
       "query-input": "required name=search_term_string"
     }
 {{ end }}
diff --git a/static/js/search.js b/static/js/search.js
index 2a4a03aff8..a76524b327 100644
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -17,7 +17,7 @@
 
         for(var i = 1; i <= 10; i++){
             if(i > pages) break;
-            pageAnchors += '<a class="bing-page-anchor" href="/docs/search/?q='+searchTerm+'&page='+i+'">';
+            pageAnchors += '<a class="bing-page-anchor" href="/search/?q='+searchTerm+'&page='+i+'">';
             pageAnchors += (currentPage == i) ? '<b>'+i+'</b>' : i;
             pageAnchors += '</a>';
         }
