diff --git a/apps/web/src/components/action-bar.tsx b/apps/web/src/components/action-bar.tsx
index f50608e..49777d2 100644
--- a/apps/web/src/components/action-bar.tsx
+++ b/apps/web/src/components/action-bar.tsx
@@ -493,8 +493,17 @@ export function ActionBar({
 	};
 
 	const toggleBrowseMode = () => {
-		setBrowseMode((m) => !m);
-		clearInput();
+		setBrowseMode((prev) => {
+			const next = !prev;
+			setSuggestionIndex(-1);
+			setQueued(null);
+			if (next) {
+				handleBrowseSearch(nameInput);
+			} else {
+				handleAddSearch(nameInput);
+			}
+			return next;
+		});
 		clearCustomFields();
 	};
 
@@ -555,6 +564,7 @@ export function ActionBar({
 									"absolute top-1/2 right-2 -translate-y-1/2 text-muted-foreground hover:text-hover-neutral",
 									browseMode && "text-accent",
 								)}
+								onMouseDown={(e) => e.preventDefault()}
 								onClick={toggleBrowseMode}
 								title={browseMode ? "Switch to add mode" : "Browse stat blocks"}
 								aria-label={