diff --git a/src/DataGrid.tsx b/src/DataGrid.tsx
index 27d34b0ab7..fd11c5277a 100644
--- a/src/DataGrid.tsx
+++ b/src/DataGrid.tsx
@@ -839,6 +839,7 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
       setSelectedPosition({ ...position, mode: 'EDIT', row, originalRow: row });
     } else if (samePosition) {
       // Avoid re-renders if the selected cell state is the same
+      setShouldFocusCell(options?.shouldFocusCell === true);
       scrollIntoView(getCellToScroll(gridRef.current!));
     } else {
       setShouldFocusCell(options?.shouldFocusCell === true);