diff --git a/frontend/src/shared/ui/components/KsDataGrid.vue b/frontend/src/shared/ui/components/KsDataGrid.vue
index be73b532..aa8def51 100644
--- a/frontend/src/shared/ui/components/KsDataGrid.vue
+++ b/frontend/src/shared/ui/components/KsDataGrid.vue
@@ -118,12 +118,16 @@ function onCellKeyDown(event: any): void {
     event.api.stopEditing(false)
     event.api.tabToNextCell(false)
 
-    setTimeout(() => {
+    const ensureEditMode = () => {
       const focusedCell = event.api.getFocusedCell()
-      if (focusedCell && focusedCell.rowIndex !== null) {
-        event.api.startEditingCell({ rowIndex: focusedCell.rowIndex, colKey: focusedCell.column.getColId() })
+      if (focusedCell) {
+        event.api.startEditingCell(focusedCell)
       }
-    }, 0)
+    }
+
+    ensureEditMode()
+    setTimeout(ensureEditMode, 10)
+    setTimeout(ensureEditMode, 50)
   }
 }