diff --git a/templates/bookshelf.templ b/templates/bookshelf.templ
index c9734d1..814df43 100644
--- a/templates/bookshelf.templ
+++ b/templates/bookshelf.templ
@@ -71,15 +71,13 @@ templ BookShelf(
 								Search
 							</label>
 							<input
+								name="q"
 								type="text"
-								name="search"
-								placeholder="Search title, author..."
-								class="w-full px-3 py-2 border rounded-lg"
-								style="background-color: var(--bg-primary); color: var(--text-primary); border-color: var(--border);"
+								placeholder="Search all fields..."
 								hx-get="/api/media-items/search"
+								hx-trigger="keyup[key=='Enter'] from:#search-form, keyup changed delay:500ms"
 								hx-target="#books-grid"
-								hx-trigger="keyup changed delay:300ms"
-								hx-include="#filter-form"
+								hx-include="#filter-form, #library-select"
 							/>
 						</div>
 						<!-- Author Filter -->