diff --git a/components/system/Files/FileEntry/index.tsx b/components/system/Files/FileEntry/index.tsx
index 9725dd65..22289e21 100644
--- a/components/system/Files/FileEntry/index.tsx
+++ b/components/system/Files/FileEntry/index.tsx
@@ -70,7 +70,14 @@ const FileEntry = ({
     <Button
       ref={buttonRef}
       {...useDoubleClick(() => openFile(pid), singleClick)}
-      {...useFileContextMenu(url, pid, path, setRenaming, fileActions)}
+      {...useFileContextMenu(
+        url,
+        pid,
+        path,
+        setRenaming,
+        fileActions,
+        focusEntry
+      )}
     >
       <figure>
         <Icon src={icon} alt={name} {...FileEntryIconSize[view]} />
diff --git a/components/system/Files/FileEntry/useFileContextMenu.ts b/components/system/Files/FileEntry/useFileContextMenu.ts
index c4c1a52f..da5f5381 100644
--- a/components/system/Files/FileEntry/useFileContextMenu.ts
+++ b/components/system/Files/FileEntry/useFileContextMenu.ts
@@ -18,7 +18,8 @@ const useFileContextMenu = (
   pid: string,
   path: string,
   setRenaming: React.Dispatch<React.SetStateAction<string>>,
-  { deleteFile, downloadFile }: FileActions
+  { deleteFile, downloadFile }: FileActions,
+  focusEntry: (entry: string) => void
 ): { onContextMenuCapture: React.MouseEventHandler<HTMLElement> } => {
   const { open } = useProcesses();
   const { setWallpaper } = useSession();
@@ -104,7 +105,10 @@ const useFileContextMenu = (
   }
 
   return {
-    onContextMenuCapture: contextMenu?.(menuItems),
+    onContextMenuCapture: (event) => {
+      focusEntry(basename(path));
+      contextMenu?.(menuItems)(event);
+    },
   };
 };