diff --git a/_docs/search/index.md b/_docs/search/index.md
index 1a784de56d..558f1c2ff2 100644
--- a/_docs/search/index.md
+++ b/_docs/search/index.md
@@ -2,15 +2,4 @@
 title: Search Results
 layout: search-results
 ---
-<script>
-    (function() {
-        var cx = '013699703217164175118:veyyqmfmpj4';
-        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:search></gcse:search>
+<gcse:searchresults-only></gcse:searchresults-only>
diff --git a/_includes/search-box.html b/_includes/search-box.html
index 332a8cddf6..4d49c5bffc 100644
--- a/_includes/search-box.html
+++ b/_includes/search-box.html
@@ -1,3 +1,7 @@
 <div class="search-box">
 	<input type="text" class="search-input" placeholder="Search istio.io" onkeydown="if (event.keyCode==13) window.location.replace('/docs/search/?q=' + this.value)" autofocus="autofocus">
+
+	<!--
+	<gcse:searchbox-only resultsUrl="/docs/search/index.html"></gcse:searchbox-only>
+	-->
 </div>
diff --git a/_layouts/base.html b/_layouts/base.html
index 1ac70ef437..b540c7dfe9 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -76,6 +76,7 @@ layout: compress
     <script src="{{home}}/js/common.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{home}}/js/waves.js"></script>
     <script src="{{home}}/js/buttons.js"></script>
+    <script src="{{home}}/js/search.js"></script>
 
     {% if page.customjs %}
       <script async="" defer="" type="text/javascript" src="{{ page.customjs }}"></script>
diff --git a/js/search.js b/js/search.js
new file mode 100644
index 0000000000..868c0e1444
--- /dev/null
+++ b/js/search.js
@@ -0,0 +1,9 @@
+(function() {
+    var cx = '013699703217164175118:veyyqmfmpj4';
+    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);
+})();