diff --git a/components/SearchModal/index.tsx b/components/SearchModal/index.tsx
index b7cdebb9..6353e51a 100644
--- a/components/SearchModal/index.tsx
+++ b/components/SearchModal/index.tsx
@@ -340,10 +340,24 @@ const SearchModal = (props: Props) => {
     }
   }
 
+  function onEscapeKeyDown(event: KeyboardEvent) {
+    event.preventDefault()
+    openChange()
+  }
+
+  function onOpenAutoFocus(event: Event) {
+    event.preventDefault()
+    if (searchInput.current) searchInput.current.focus()
+  }
+
   return (
     <Dialog open={open} onOpenChange={openChange}>
       <DialogTrigger asChild>{props.children}</DialogTrigger>
-      <DialogContent className="Search Dialog">
+      <DialogContent
+        className="Search Dialog"
+        onEscapeKeyDown={onEscapeKeyDown}
+        onOpenAutoFocus={onOpenAutoFocus}
+      >
         <div id="Header">
           <div id="Bar">
             <Input