diff --git a/scribble-lib/scribble/html-render.rkt b/scribble-lib/scribble/html-render.rkt
index c7b325eb..e243d8b8 100644
--- a/scribble-lib/scribble/html-render.rkt
+++ b/scribble-lib/scribble/html-render.rkt
@@ -225,6 +225,7 @@
     `(form ([class "searchform"])
        (input
         ([class "searchbox"]
+         [id "searchbox"]
          [type "text"]
          [tabindex "1"]
          [placeholder ,emptylabel]
diff --git a/scribble-lib/scribble/scribble-common.js b/scribble-lib/scribble/scribble-common.js
index f1b1bf63..dcd79b48 100644
--- a/scribble-lib/scribble/scribble-common.js
+++ b/scribble-lib/scribble/scribble-common.js
@@ -173,8 +173,10 @@ AddOnLoad(function(){
 AddOnLoad(function(){
   window.addEventListener("keyup", function(e) {
     if ((e.key === 's' || e.key === 'S') && e.target === document.body) {
-      var field = document.getElementsByClassName("searchbox")[0];
-      field.focus();
+      var searchBox = document.getElementById('searchbox');
+      if (searchBox) {
+        searchBox.focus();
+      }
     }
   }, false);
 });