diff --git a/components/search.templ b/components/search.templ
index c5a2802..7e31621 100644
--- a/components/search.templ
+++ b/components/search.templ
@@ -112,6 +112,7 @@ templ SearchButton(args SearchButtonArgs) {
 templ searchDialog(args SearchButtonArgs) {
 	<dialog
 		id="search-dialog"
+		onclick="if(event.target===this)this.close()"
 		class="backdrop:o-backdrop-blur-sm o-max-w-prose o-w-full o-h-full o-px-4 sm:o-px-0 o-bg-transparent"
 	>
 		<div class="o-h-full o-flex o-flex-col">
@@ -138,12 +139,13 @@ templ searchDialog(args SearchButtonArgs) {
 				</div>
 				<div class="o-flex o-gap-3 o-justify-between o-items-center o-border-t o-border-t-black/10 dark:o-border-t-white/10 o-p-3">
 					@loadingTagSelectors()
-					<div
-						class="o-inline-flex o-gap-2 o-items-center o-text-sm dark:o-text-white"
+					<button
+						onclick="this.closest('dialog').close()"
+						class="o-inline-flex o-gap-2 o-items-center o-text-sm dark:o-text-white o-cursor-pointer"
 					>
 						<span class="o-text-caption">Close</span>
 						@KBD("esc")
-					</div>
+					</button>
 				</div>
 			</div>
 			@SearchResults(SearchResultsArgs{})
diff --git a/components/search_templ.go b/components/search_templ.go
index 390c20a..39c247e 100644
--- a/components/search_templ.go
+++ b/components/search_templ.go
@@ -335,7 +335,7 @@ func searchDialog(args SearchButtonArgs) templ.Component {
 			templ_7745c5c3_Var9 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<dialog id=\"search-dialog\" class=\"backdrop:o-backdrop-blur-sm o-max-w-prose o-w-full o-h-full o-px-4 sm:o-px-0 o-bg-transparent\"><div class=\"o-h-full o-flex o-flex-col\"><div id=\"search\" hx-post=\"/search\" hx-trigger=\"input changed delay:500ms from:[name='query'], change from:'#search [type='checkbox']'\" hx-include=\"#search input\" hx-target=\"#search-results\" hx-indicator=\"#loader\" class=\"o-rounded-lg o-overflow-hidden o-bg-white dark:o-bg-black o-mb-2\"><div class=\"input o-rounded-none o-border-none o-flex o-items-center o-gap-2 \"><div id=\"loader\" class=\"o-flex o-gap-2\"><div class=\"htmx-indicator-rev\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<dialog id=\"search-dialog\" onclick=\"if(event.target===this)this.close()\" class=\"backdrop:o-backdrop-blur-sm o-max-w-prose o-w-full o-h-full o-px-4 sm:o-px-0 o-bg-transparent\"><div class=\"o-h-full o-flex o-flex-col\"><div id=\"search\" hx-post=\"/search\" hx-trigger=\"input changed delay:500ms from:[name='query'], change from:'#search [type='checkbox']'\" hx-include=\"#search input\" hx-target=\"#search-results\" hx-indicator=\"#loader\" class=\"o-rounded-lg o-overflow-hidden o-bg-white dark:o-bg-black o-mb-2\"><div class=\"input o-rounded-none o-border-none o-flex o-items-center o-gap-2 \"><div id=\"loader\" class=\"o-flex o-gap-2\"><div class=\"htmx-indicator-rev\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -367,7 +367,7 @@ func searchDialog(args SearchButtonArgs) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div class=\"o-inline-flex o-gap-2 o-items-center o-text-sm dark:o-text-white\"><span class=\"o-text-caption\">Close</span>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<button onclick=\"this.closest(&#39;dialog&#39;).close()\" class=\"o-inline-flex o-gap-2 o-items-center o-text-sm dark:o-text-white o-cursor-pointer\"><span class=\"o-text-caption\">Close</span>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -375,7 +375,7 @@ func searchDialog(args SearchButtonArgs) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</div></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</button></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}