diff --git a/frontend/src/shared/ui/components/KsDataGrid.vue b/frontend/src/shared/ui/components/KsDataGrid.vue
index 29556146..aa8def51 100644
--- a/frontend/src/shared/ui/components/KsDataGrid.vue
+++ b/frontend/src/shared/ui/components/KsDataGrid.vue
@@ -116,10 +116,18 @@ function onCellKeyDown(event: any): void {
   if (event.event.key === 'Enter' && event.colDef?.editable) {
     event.event.preventDefault()
     event.api.stopEditing(false)
+    event.api.tabToNextCell(false)
 
-    setTimeout(() => {
-      event.api.tabToNextCell(false)
-    }, 0)
+    const ensureEditMode = () => {
+      const focusedCell = event.api.getFocusedCell()
+      if (focusedCell) {
+        event.api.startEditingCell(focusedCell)
+      }
+    }
+
+    ensureEditMode()
+    setTimeout(ensureEditMode, 10)
+    setTimeout(ensureEditMode, 50)
   }
 }