diff --git a/plugins/file-manager/src/frontend/FileManagerGrid.tsx b/plugins/file-manager/src/frontend/FileManagerGrid.tsx
index 9e3ad5355..443c67a21 100644
--- a/plugins/file-manager/src/frontend/FileManagerGrid.tsx
+++ b/plugins/file-manager/src/frontend/FileManagerGrid.tsx
@@ -1232,7 +1232,7 @@ export function FileManagerGrid({
                                 "group flex flex-col items-center rounded-none border-2 border-transparent transition-all cursor-pointer hover:bg-muted/50 select-none",
                                 compact ? "p-1.5" : "p-3",
                                 isSelected &&
-                                  "bg-accent-brand/10 border-accent-brand/40",
+                                  "bg-accent-brand/10 hover:bg-accent-brand/10 border-accent-brand/40",
                                 dragState.target?.path === file.path &&
                                   "bg-accent-brand/20 border-accent-brand border-dashed",
                                 dragState.files.some(
@@ -1443,7 +1443,8 @@ export function FileManagerGrid({
                           compact
                             ? "px-2 py-1 text-[11px]"
                             : "px-4 py-2 text-xs",
-                          isSelected && "bg-accent-brand/10",
+                          isSelected &&
+                            "bg-accent-brand/10 hover:bg-accent-brand/10",
                           dragState.target?.path === file.path &&
                             "bg-accent-brand/20 border-accent-brand border-dashed",
                           dragState.files.some((f) => f.path === file.path) &&
diff --git a/plugins/file-manager/src/frontend/LocalFilePane.tsx b/plugins/file-manager/src/frontend/LocalFilePane.tsx
index 1ab2766b0..5290b15d9 100644
--- a/plugins/file-manager/src/frontend/LocalFilePane.tsx
+++ b/plugins/file-manager/src/frontend/LocalFilePane.tsx
@@ -1001,7 +1001,8 @@ export function LocalFilePane({
                     style={rowStyle}
                     className={cn(
                       "grid gap-2 px-3 items-center text-xs cursor-default border-b border-border hover:bg-muted/50 rounded-none select-none transition-colors h-[34px]",
-                      isSelected && "bg-accent-brand/10",
+                      isSelected &&
+                        "bg-accent-brand/10 hover:bg-accent-brand/10",
                       isFolderTarget &&
                         "bg-accent-brand/20 outline outline-1 outline-dashed outline-accent-brand",
                       entry.hidden && "opacity-60",
diff --git a/src/ui/tests/sidebar/UserProfilePanel.test.tsx b/src/ui/tests/sidebar/UserProfilePanel.test.tsx
index 58d6a1e7c..b47f3921b 100644
--- a/src/ui/tests/sidebar/UserProfilePanel.test.tsx
+++ b/src/ui/tests/sidebar/UserProfilePanel.test.tsx
@@ -39,7 +39,11 @@ import {
   NewApiKeyDialog,
 } from "../../sidebar/UserProfilePanel";
 
-afterEach(cleanup);
+afterEach(async () => {
+  cleanup();
+  // Radix restores focus on a timer; let it finish before jsdom is torn down.
+  await new Promise<void>((resolve) => setTimeout(resolve, 0));
+});
 
 function renderSection(hidden: boolean, open = false, onToggle = vi.fn()) {
   render(