diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 76449a171d7cc..55f9fe3968a29 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -2859,6 +2859,10 @@ function defocusSearchBar() {
     function enableSearchInput() {
         if (search_input) {
             search_input.removeAttribute('disabled');
+            var params = getQueryStringParams();
+            if (search_input.value !== "" || (params && params.search)) {
+                search_input.focus();
+            }
         }
     }