diff --git a/frontend/src/components/header-search.tsx b/frontend/src/components/header-search.tsx
index 3b08cda..fc10e65 100644
--- a/frontend/src/components/header-search.tsx
+++ b/frontend/src/components/header-search.tsx
@@ -93,13 +93,16 @@ export function HeaderSearch({ defaultDataSource }: { defaultDataSource?: string
             </div>
 
             {open && results.length > 0 && (
-                <div className="absolute top-full mt-2 left-0 w-full bg-popover text-popover-foreground rounded-md border shadow-md z-[80] overflow-hidden max-h-[400px] overflow-y-auto">
+                <div className="absolute top-full mt-2 left-0 w-full bg-popover text-popover-foreground rounded-md border shadow-md z-[90] overflow-hidden max-h-[400px] overflow-y-auto">
                     <div className="p-1">
                         {results.map((result) => (
                             <button
                                 key={`${result.market}-${result.symbol}`}
                                 className="w-full flex items-center justify-between p-2 hover:bg-accent hover:text-accent-foreground rounded-sm text-sm text-left transition-colors"
-                                onClick={() => handleSelect(result)}
+                                onMouseDown={(e) => {
+                                    e.preventDefault() // Prevent focus loss
+                                    handleSelect(result)
+                                }}
                             >
                                 <div className="flex flex-col overflow-hidden">
                                     <span className="font-medium truncate">{result.company_name}</span>
diff --git a/frontend/src/components/nav-header.tsx b/frontend/src/components/nav-header.tsx
index 17f0fb1..f2c4ecf 100644
--- a/frontend/src/components/nav-header.tsx
+++ b/frontend/src/components/nav-header.tsx
@@ -82,7 +82,7 @@ export function NavHeader() {
     }
 
     return (
-        <header className="border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 z-[60]">
+        <header className="border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 z-[60] relative">
             <div className="flex h-14 items-center gap-4 px-6 lg:h-[60px] w-full px-8"> {/* Adjusted constraint */}
                 <Link className="flex items-center gap-2 font-semibold min-w-[140px]" href="/">
                     <MonitorPlay className="h-6 w-6" />