diff --git a/crates/docs/src/static/index.html b/crates/docs/src/static/index.html
index cc48938014..c759358f38 100644
--- a/crates/docs/src/static/index.html
+++ b/crates/docs/src/static/index.html
@@ -15,7 +15,7 @@
 <body>
 <nav id="sidebar-nav">
     <input id="module-search" aria-labelledby="search-link" type="text" placeholder="Search" />
-    <label for="module-search" id="search-link">Search</label>
+    <label for="module-search" id="search-link"><span id="search-link-text">Search</span> <span id="search-link-hint">(shortcut: S)</span></label>
     <div class="module-links">
         <!-- Module links -->
     </div>
diff --git a/crates/docs/src/static/search.js b/crates/docs/src/static/search.js
index 7204fc2afd..cd5429a989 100644
--- a/crates/docs/src/static/search.js
+++ b/crates/docs/src/static/search.js
@@ -45,20 +45,18 @@
 
   search();
 
-  // Capture '/' keypress for quick search 
+  // Capture '/' keypress for quick search
   window.addEventListener("keyup", (e) => {
-
-    if (e.code === "Slash") {
+    if (e.key === "s") {
       e.preventDefault;
       searchBox.focus();
       searchBox.value = "";
     }
 
-    if (e.code === "Escape" && document.activeElement === searchBox) {
+    if (e.key === "Escape" && document.activeElement === searchBox) {
       e.preventDefault;
       searchBox.blur();
     }
-
   });
 
 })();
diff --git a/crates/docs/src/static/styles.css b/crates/docs/src/static/styles.css
index a7f158e873..b25b71c56c 100644
--- a/crates/docs/src/static/styles.css
+++ b/crates/docs/src/static/styles.css
@@ -446,10 +446,16 @@ pre {
   cursor: pointer;
 }
 
-#search-link:hover {
+#search-link:hover #search-link-text {
   text-decoration: underline;
 }
 
+#search-link-hint {
+  font-style: italic;
+  margin-left: 1em;
+  opacity: 0.7;
+}
+
 @media (prefers-color-scheme: dark) {
   :root {
     --body-bg-color: var(--purple-8);
