diff --git a/apps/ui/src/app.tsx b/apps/ui/src/app.tsx
index 0e15fa5f..dedd9e8d 100644
--- a/apps/ui/src/app.tsx
+++ b/apps/ui/src/app.tsx
@@ -76,7 +76,7 @@ export default function App() {
   }, []);
 
   return (
-    <TooltipProvider>
+    <TooltipProvider delayDuration={300}>
       <RouterProvider router={router} />
       {showSplash && !disableSplashScreen && <SplashScreen onComplete={handleSplashComplete} />}
     </TooltipProvider>
diff --git a/apps/ui/src/components/views/graph-view/components/graph-filter-controls.tsx b/apps/ui/src/components/views/graph-view/components/graph-filter-controls.tsx
index dbbf9fd3..16c9abf6 100644
--- a/apps/ui/src/components/views/graph-view/components/graph-filter-controls.tsx
+++ b/apps/ui/src/components/views/graph-view/components/graph-filter-controls.tsx
@@ -164,7 +164,11 @@ export function GraphFilterControls({
             </TooltipTrigger>
             <TooltipContent>Filter by Category</TooltipContent>
           </Tooltip>
-          <PopoverContent align="start" className="w-56 p-2">
+          <PopoverContent
+            align="start"
+            className="w-56 p-2"
+            onOpenAutoFocus={(e) => e.preventDefault()}
+          >
             <div className="space-y-2">
               <div className="text-xs font-medium text-muted-foreground px-2 py-1">Categories</div>
 
@@ -236,7 +240,11 @@ export function GraphFilterControls({
             </TooltipTrigger>
             <TooltipContent>Filter by Status</TooltipContent>
           </Tooltip>
-          <PopoverContent align="start" className="w-56 p-2">
+          <PopoverContent
+            align="start"
+            className="w-56 p-2"
+            onOpenAutoFocus={(e) => e.preventDefault()}
+          >
             <div className="space-y-2">
               <div className="text-xs font-medium text-muted-foreground px-2 py-1">Status</div>
 
diff --git a/apps/ui/src/components/views/graph-view/components/task-node.tsx b/apps/ui/src/components/views/graph-view/components/task-node.tsx
index 8f7e1b74..98b95c46 100644
--- a/apps/ui/src/components/views/graph-view/components/task-node.tsx
+++ b/apps/ui/src/components/views/graph-view/components/task-node.tsx
@@ -286,50 +286,44 @@ export const TaskNode = memo(function TaskNode({ data, selected }: TaskNodeProps
 
             {/* Blocked indicator */}
             {data.isBlocked && !data.error && data.status === 'backlog' && (
-              <TooltipProvider delayDuration={200}>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <div className="p-1 rounded bg-orange-500/20">
-                      <Lock className="w-3 h-3 text-orange-500" />
-                    </div>
-                  </TooltipTrigger>
-                  <TooltipContent side="top" className="text-xs max-w-[200px]">
-                    <p>Blocked by {data.blockingDependencies.length} dependencies</p>
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <div className="p-1 rounded bg-orange-500/20">
+                    <Lock className="w-3 h-3 text-orange-500" />
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent side="top" className="text-xs max-w-[200px]">
+                  <p>Blocked by {data.blockingDependencies.length} dependencies</p>
+                </TooltipContent>
+              </Tooltip>
             )}
 
             {/* Error indicator */}
             {data.error && (
-              <TooltipProvider delayDuration={200}>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <div className="p-1 rounded bg-[var(--status-error-bg)]">
-                      <AlertCircle className="w-3 h-3 text-[var(--status-error)]" />
-                    </div>
-                  </TooltipTrigger>
-                  <TooltipContent side="top" className="text-xs max-w-[250px]">
-                    <p>{data.error}</p>
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <div className="p-1 rounded bg-[var(--status-error-bg)]">
+                    <AlertCircle className="w-3 h-3 text-[var(--status-error)]" />
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent side="top" className="text-xs max-w-[250px]">
+                  <p>{data.error}</p>
+                </TooltipContent>
+              </Tooltip>
             )}
 
             {/* Stopped indicator - task is in_progress but not actively running */}
             {isStopped && (
-              <TooltipProvider delayDuration={200}>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <div className="p-1 rounded bg-[var(--status-warning-bg)]">
-                      <Pause className="w-3 h-3 text-[var(--status-warning)]" />
-                    </div>
-                  </TooltipTrigger>
-                  <TooltipContent side="top" className="text-xs max-w-[200px]">
-                    <p>Task paused - click menu to resume</p>
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <div className="p-1 rounded bg-[var(--status-warning-bg)]">
+                    <Pause className="w-3 h-3 text-[var(--status-warning)]" />
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent side="top" className="text-xs max-w-[200px]">
+                  <p>Task paused - click menu to resume</p>
+                </TooltipContent>
+              </Tooltip>
             )}
 
             {/* Actions dropdown */}
diff --git a/apps/ui/src/components/views/settings-view/account/account-section.tsx b/apps/ui/src/components/views/settings-view/account/account-section.tsx
index 9b717753..abacd8ee 100644
--- a/apps/ui/src/components/views/settings-view/account/account-section.tsx
+++ b/apps/ui/src/components/views/settings-view/account/account-section.tsx
@@ -134,24 +134,22 @@ export function AccountSection() {
                 })}
               </SelectContent>
             </Select>
-            <TooltipProvider>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    onClick={handleRefreshEditors}
-                    disabled={isRefreshing || isLoadingEditors}
-                    className="shrink-0 h-9 w-9"
-                  >
-                    {isRefreshing ? <Spinner size="sm" /> : <RefreshCw className="w-4 h-4" />}
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent>
-                  <p>Refresh available editors</p>
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  onClick={handleRefreshEditors}
+                  disabled={isRefreshing || isLoadingEditors}
+                  className="shrink-0 h-9 w-9"
+                >
+                  {isRefreshing ? <Spinner size="sm" /> : <RefreshCw className="w-4 h-4" />}
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>
+                <p>Refresh available editors</p>
+              </TooltipContent>
+            </Tooltip>
           </div>
         </div>