From b78fc884e3bb5298c6430939ba06b054d68eb4e2 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Fri, 27 Feb 2026 18:24:54 +0530
Subject: [PATCH] Fixed an issue in file dialog where rename was not working.
 #9651

---
 docs/en_US/release_notes_9_13.rst                      |  2 ++
 .../file_manager/static/js/components/ListView.jsx     | 10 ++++++++--
 web/pgadmin/static/js/components/PgReactDataGrid.jsx   |  4 ++--
 web/regression/requirements.txt                        |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/en_US/release_notes_9_13.rst b/docs/en_US/release_notes_9_13.rst
index 06e52dc42..86de68ad8 100644
--- a/docs/en_US/release_notes_9_13.rst
+++ b/docs/en_US/release_notes_9_13.rst
@@ -41,5 +41,7 @@ Bug fixes
   | `Issue #9486 <https://github.com/pgadmin-org/pgadmin4/issues/9486>`_ - Fixed an issue where column comments were not displayed in the SQL tab for materialised views.
   | `Issue #9572 <https://github.com/pgadmin-org/pgadmin4/issues/9572>`_ - Fix an issue where deployment of helm chart crashing with operation not permitted.
   | `Issue #9583 <https://github.com/pgadmin-org/pgadmin4/issues/9583>`_ - Fix translation compilation.
+  | `Issue #9649 <https://github.com/pgadmin-org/pgadmin4/issues/9649>`_ - Fix broken checkbox selection in backup dialog objects tree.
+  | `Issue #9651 <https://github.com/pgadmin-org/pgadmin4/issues/9651>`_ - Fixed an issue in file dialog where rename was not working.
 
 
diff --git a/web/pgadmin/misc/file_manager/static/js/components/ListView.jsx b/web/pgadmin/misc/file_manager/static/js/components/ListView.jsx
index 96f66555b..bf7010522 100644
--- a/web/pgadmin/misc/file_manager/static/js/components/ListView.jsx
+++ b/web/pgadmin/misc/file_manager/static/js/components/ListView.jsx
@@ -131,13 +131,15 @@ const columns = [
 ];
 
 
-export default function ListView({items, operation, ...props}) {
+export default function ListView({items, operation, onItemEnter, ...props}) {
   const gridRef = useRef();
 
   useEffect(()=>{
     if(operation.type) {
       operation.type == 'add' && gridRef.current.scrollToCell({rowIdx: operation.idx});
-      gridRef.current.selectCell({idx: 0, rowIdx: operation.idx}, true);
+      gridRef.current.selectCell({idx: 0, rowIdx: operation.idx}, {
+        enableEditor: true
+      });
     }
   }, [operation]);
 
@@ -171,6 +173,10 @@ export default function ListView({items, operation, ...props}) {
       noRowsText={gettext('No files/folders found')}
       onRowsChange={onRowsChange}
       onCellKeyDown={onCellKeyDown}
+      onItemEnter={(row, e)=>{
+        e.preventGridDefault();
+        onItemEnter(row);
+      }}
       {...props}
     />
   );
diff --git a/web/pgadmin/static/js/components/PgReactDataGrid.jsx b/web/pgadmin/static/js/components/PgReactDataGrid.jsx
index 83ac1ae80..1f6db4d38 100644
--- a/web/pgadmin/static/js/components/PgReactDataGrid.jsx
+++ b/web/pgadmin/static/js/components/PgReactDataGrid.jsx
@@ -109,7 +109,7 @@ export function CustomRow({inTest=false, ...props}) {
   }
 
   const onCellClick = (args) => {
-    gridUtils.onItemClick?.(args.row.rowIdx);
+    gridUtils.onItemClick?.(args.rowIdx);
     props.onRowClick?.(args.row);
   };
 
@@ -117,7 +117,7 @@ export function CustomRow({inTest=false, ...props}) {
     // check if grid default is prevented.
     props.onCellDoubleClick?.(args, e);
     if(e.isGridDefaultPrevented()) return;
-    gridUtils.onItemEnter?.(args.row);
+    gridUtils.onItemEnter?.(args.row, e);
   };
 
   return (
diff --git a/web/regression/requirements.txt b/web/regression/requirements.txt
index b828358b5..d972a959b 100644
--- a/web/regression/requirements.txt
+++ b/web/regression/requirements.txt
@@ -22,7 +22,7 @@
 # relevant packages.
 ###########################################################
 extras==1.0.0
-fixtures==4.3.0
+fixtures==4.3.1
 linecache2==1.0.0
 pbr==7.0.3
 pycodestyle>=2.5.0