diff --git a/docs b/docs
index c19e4f65..8d908132 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit c19e4f65170e368b012bd03d0f928da376e88323
+Subproject commit 8d90813220dba9fa4ddb45b44661b688bdac9ddd
diff --git a/package-lock.json b/package-lock.json
index 6a277e3d..527acb49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@revolist/revogrid",
-  "version": "4.11.10",
+  "version": "4.11.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@revolist/revogrid",
-      "version": "4.11.10",
+      "version": "4.11.11",
       "license": "MIT",
       "devDependencies": {
         "@angular/core": "^18.1.2",
diff --git a/src/components/overlay/revogr-overlay-selection.tsx b/src/components/overlay/revogr-overlay-selection.tsx
index e04bed58..d177743c 100644
--- a/src/components/overlay/revogr-overlay-selection.tsx
+++ b/src/components/overlay/revogr-overlay-selection.tsx
@@ -543,18 +543,6 @@ export class OverlaySelection {
           editCell.x,
           this.editors,
         )}
-        onCloseedit={e => this.closeEdit(e)}
-        onCelledit={e => {
-          const saveEv = this.beforeCellSave.emit(e.detail);
-          if (!saveEv.defaultPrevented) {
-            this.cellEdit(saveEv.detail);
-          }
-
-          // if not clear navigate to next cell after edit
-          if (!saveEv.detail.preventFocus) {
-            this.focusNext();
-          }
-        }}
       />
     );
   }
@@ -613,6 +601,18 @@ export class OverlaySelection {
         onDblClick={(e: MouseEvent) => this.onElementDblClick(e)}
         onMouseDown={(e: MouseEvent) => this.onElementMouseDown(e)}
         onTouchStart={(e: TouchEvent) => this.onElementMouseDown(e, true)}
+        onCloseedit={(e: CustomEvent<boolean | undefined>) => this.closeEdit(e)}
+        onCelledit={(e: CustomEvent<SaveDataDetails>) => {
+          const saveEv = this.beforeCellSave.emit(e.detail);
+          if (!saveEv.defaultPrevented) {
+            this.cellEdit(saveEv.detail);
+          }
+
+          // if not clear navigate to next cell after edit
+          if (!saveEv.detail.preventFocus) {
+            this.focusNext();
+          }
+        }}
       >
         {nodes}
         <slot name="data" />