diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue
index 8e7da198..8ae6a8f3 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue
@@ -16,6 +16,7 @@
       :set-old-value="setOldValue"
       :no-data-tr-colspan="noDataTrColspan"
       :updates="updates"
+      :row-index="scope.rowIndex"
     ></TreeGridRow>
   </template>
   <template v-else>
@@ -24,8 +25,8 @@
       :class="props.scope.row[table.selectedField] ? 'selected' : ''"
       :props="props.scope"
       :draggable="draggableComputed"
-      @click.stop="rowClick($event, scope.row, scope.rowIndex)"
-      @dblclick.stop="rowDbClick($event, scope.row, scope.rowIndex)"
+      @click.stop="props.rowClick($event, scope.row, scope.rowIndex)"
+      @dblclick.stop="props.rowDbClick($event, scope.row, scope.rowIndex)"
       @dragleave="draggableComputed ? onDragLeave($event) : () => {}"
       @dragover="draggableComputed ? onDragOver($event, scope) : () => {}"
       @drop="draggableComputed ? onDrop($event, scope) : () => {}"
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
index a84b669a..3e02ef8c 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
@@ -3,8 +3,8 @@
     ref="trRef"
     :class="row[table.selectedField] ? 'selected ' : ''"
     :draggable="draggableComputed"
-    @click.stop.prevent="click($event, row, row.rowIndex)"
-    @dblclick.stop.prevent="dbClick($event, row, row.rowIndex)"
+    @click.stop.prevent="click($event, row, props.rowIndex)"
+    @dblclick.stop.prevent="dbClick($event, row, props.rowIndex)"
     @dragleave="draggableComputed ? onDragLeave($event, row) : () => {}"
     @dragover="draggableComputed ? onDragOver($event, row) : () => {}"
     @drop="draggableComputed ? onDrop($event, row) : () => {}"
@@ -106,7 +106,7 @@
     :set-old-value="props.setOldValue"
     :no-data-tr-colspan="props.noDataTrColspan"
   ></GridEditToolbar>
-  <template v-for="child in row.children" :key="child[rowKey]">
+  <template v-for="(child, index) in row.children" :key="child[rowKey]">
     <TreeGridRow
       v-if="row.expand"
       :columns-map="props.columnsMap"
@@ -124,6 +124,7 @@
       :set-old-value="props.setOldValue"
       :no-data-tr-colspan="props.noDataTrColspan"
       :updates="props.updates"
+      :row-index="index"
     ></TreeGridRow>
   </template>
 </template>
@@ -158,6 +159,7 @@ const props = defineProps({
     },
   },
   rowKey: { type: String, default: '_rowKey_' },
+  rowIndex: { type: Number, default: undefined },
   grid: {
     type: Object,
     default: () => {
@@ -694,12 +696,7 @@ const click = (evt, row, rowIndex) => {
   }
 };
 const dbClick = (evt, row, rowIndex) => {
-  props.gridRowDbClick({
-    grid: props.grid,
-    evt: evt,
-    row: row,
-    index: rowIndex,
-  });
+  props.gridRowDbClick(evt, row, rowIndex);
 };
 
 const setComponentRef = (el, row, col) => {