diff --git a/layouts/partials/docs/top-menu.html b/layouts/partials/docs/top-menu.html
index 768fbc76a87fd..9351c5eefb5ff 100644
--- a/layouts/partials/docs/top-menu.html
+++ b/layouts/partials/docs/top-menu.html
@@ -15,7 +15,7 @@ <h5>{{ .Params.abstract }}</h5>
 		<li><a href="{{ .RelPermalink }}"{{ if $yah }} class="YAH"{{ end }}>{{ .LinkTitle | upper }}</a></li>
 		{{ end }}
 	</ul>
-	<div id="searchBox">
-		<input type="text" id="search" placeholder="Search" onkeydown="if (event.keyCode==13) window.location.replace('/docs/search/?q=' + this.value)" autofocus="autofocus">
-	</div>
+	<form id="searchBox" action="/docs/search/">
+		<input type="text" id="search" name="q" placeholder="Search" aria-label="Search">
+	</form>
 </div>