diff --git a/internal/assets/static/js/main.js b/internal/assets/static/js/main.js
index 25d78ca6..770a45af 100644
--- a/internal/assets/static/js/main.js
+++ b/internal/assets/static/js/main.js
@@ -614,6 +614,10 @@ async function setupPage() {
         setupLazyImages();
     } finally {
         pageElement.classList.add("content-ready");
+        const inputElement = document.getElementsByClassName("search-input")[0];
+		if (inputElement.dataset.autofocus == 'autofocus'){
+			inputElement.focus()
+		}
 
         for (let i = 0; i < contentReadyCallbacks.length; i++) {
             contentReadyCallbacks[i]();
diff --git a/internal/assets/templates/search.html b/internal/assets/templates/search.html
index df84e9da..79e6af46 100644
--- a/internal/assets/templates/search.html
+++ b/internal/assets/templates/search.html
@@ -16,7 +16,7 @@
         </svg>
     </div>
 
-    <input class="search-input" type="text" placeholder="Type here to search…" autocomplete="off"{{ if .Autofocus }} autofocus{{ end }}>
+    <input class="search-input" type="text" placeholder="Type here to search…" autocomplete="off" data-autofocus="{{ if .Autofocus }}autofocus{{ end }}">
 
     <div class="search-bang"></div>
     <kbd class="hide-on-mobile" title="Press [S] to focus the search input">S</kbd>