diff --git a/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx b/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx
index bf726a900..0c7946f57 100644
--- a/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx
+++ b/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx
@@ -115,24 +115,18 @@ export default function FileRendererComponent({
                   file.progress === -1 &&
                   "pointer-events-none text-placeholder-foreground",
               )}
-              onDoubleClick={(e) => {
-                e.stopPropagation();
-                if (!file.progress && !handleRemove) {
-                  setOpenRename(true);
-                }
-              }}
             >
               <ShadTooltip content={`${file.name}.${type}`} side="bottom">
                 <span
                   className={cn(
-                    "w-full cursor-text overflow-hidden truncate",
+                    "w-full cursor-pointer overflow-hidden truncate",
                     handleRemove && "cursor-default",
                   )}
                 >
                   {file.name}.{type}
                 </span>
               </ShadTooltip>
-              <span className="shrink-0 cursor-default text-xs font-normal text-muted-foreground">
+              <span className="shrink-0 text-xs font-normal text-muted-foreground">
                 {formatFileSize(file.size)}
               </span>
             </span>
diff --git a/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx b/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx
index 10284fb68..b58071df0 100644
--- a/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx
+++ b/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx
@@ -91,8 +91,8 @@ export default function RecentFilesComponent({
             files={searchResults
               .toSorted((a, b) => {
                 const selectedOrder = sortByBoolean(
-                  selectedFiles.includes(a.path) || a.progress !== undefined,
-                  selectedFiles.includes(b.path) || b.progress !== undefined,
+                  a.progress !== undefined,
+                  b.progress !== undefined,
                 );
                 return selectedOrder === 0
                   ? sortByDate(
diff --git a/src/frontend/tests/core/unit/fileUploadComponent.spec.ts b/src/frontend/tests/core/unit/fileUploadComponent.spec.ts
index e301869eb..06817180f 100644
--- a/src/frontend/tests/core/unit/fileUploadComponent.spec.ts
+++ b/src/frontend/tests/core/unit/fileUploadComponent.spec.ts
@@ -169,10 +169,8 @@ test(
         timeout: 1000,
       });
 
-      await page
-        .getByText(`${jsonFileName}.json`)
-        .first()
-        .click({ clickCount: 2 });
+      await page.getByTestId(`context-menu-button-${jsonFileName}`).click();
+      await page.getByTestId("btn-rename-file").click();
       await page
         .getByTestId(`rename-input-${jsonFileName}`)
         .fill(renamedJsonFile);