diff --git a/app/components/header.hbs b/app/components/header.hbs
index c2307c6acdf..5a2b6d99c70 100644
--- a/app/components/header.hbs
+++ b/app/components/header.hbs
@@ -10,7 +10,7 @@
         The Rust community’s crate registry
       </h1>
 
-      <SearchForm @size={{if @hero "big"}} />
+      <SearchForm @size={{if @hero "big"}} @autofocus={{@hero}} />
     </div>
 
     <nav local-class='nav'>
diff --git a/app/components/search-form.hbs b/app/components/search-form.hbs
index c5b8a284cdd..9722be0c1b0 100644
--- a/app/components/search-form.hbs
+++ b/app/components/search-form.hbs
@@ -26,7 +26,7 @@
     placeholder="Type 'S' or '/' to search"
     value={{this.header.searchValue}}
     oninput={{this.updateSearchValue}}
-    autofocus="autofocus"
+    autofocus={{@autofocus}}
     required
     aria-label="Search"
     data-test-search-input