diff --git a/src/renderer/src/stories/Search.js b/src/renderer/src/stories/Search.js
index 1d45a491d..e6efff90b 100644
--- a/src/renderer/src/stories/Search.js
+++ b/src/renderer/src/stories/Search.js
@@ -315,9 +315,10 @@ export class Search extends LitElement {
                     const listItemElement = document.createElement("li");
                     listItemElement.classList.add("option");
                     listItemElement.setAttribute("hidden", "");
+                    listItemElement.setAttribute("tabindex", -1);
                     if (option.keywords) listItemElement.setAttribute("data-keywords", JSON.stringify(option.keywords));
-                    listItemElement.addEventListener("click", (ev) => {
-                        ev.stopPropagation();
+                    listItemElement.addEventListener("click", (clickEvent) => {
+                        clickEvent.stopPropagation();
                         this.#onSelect(option);
                     });
 
@@ -393,18 +394,21 @@ export class Search extends LitElement {
     <div class="header" style=${styleMap({
         ...this.headerStyles,
     })}>
-      <input placeholder="Type here to search" value=${valueToDisplay} @click=${(ev) => {
-          ev.stopPropagation();
+      <input placeholder="Type here to search" value=${valueToDisplay} @click=${(clickEvent) => {
+          clickEvent.stopPropagation();
           if (this.listMode === "click") {
-              const input = ev.target.value;
+              const input = clickEvent.target.value;
               this.#populate(input);
           }
-      }} @input=${(ev) => {
-          const input = ev.target.value;
+      }}
+
+      @input=${(inputEvent) => {
+          const input = inputEvent.target.value;
           this.#populate(input);
       }}
 
-      @blur=${(ev) => {
+      @blur=${(blurEvent) => {
+          if (blurEvent.relatedTarget.classList.contains("option")) return;
           this.submit();
       }}