diff --git a/api/js/egw_action/egwDragActionImplementation.ts b/api/js/egw_action/egwDragActionImplementation.ts
index 025abfdf00..3b59173263 100644
--- a/api/js/egw_action/egwDragActionImplementation.ts
+++ b/api/js/egw_action/egwDragActionImplementation.ts
@@ -110,8 +110,10 @@ export class EgwDragActionImplementation implements EgwActionImplementation {
             }
 
             // Bind mouse handlers
-            //TODO can i just remove jquery.off??
-            //jQuery(node).off("mousedown")
+            //et2_dataview_view_aoi binds mousedown event in et2_dataview_rowAOI to "egwPreventSelect" function from egw_action_common via jQuery.mousedown
+            //jQuery(node).off("mousedown",egwPreventSelect)
+            //et2_dataview_view_aoi binds mousedown event in et2_dataview_rowAOI to "egwPreventSelect" function from egw_action_common via addEventListener
+            //node.removeEventListener("mousedown",egwPreventSelect)
             node.addEventListener("mousedown", (event) => {
                 if (_context.isSelection(event)) {
                     node.setAttribute("draggable", false);
diff --git a/api/js/etemplate/et2_dataview_view_aoi.ts b/api/js/etemplate/et2_dataview_view_aoi.ts
index 063fe28142..3b2708d5f3 100644
--- a/api/js/etemplate/et2_dataview_view_aoi.ts
+++ b/api/js/etemplate/et2_dataview_view_aoi.ts
@@ -58,7 +58,8 @@ export function et2_dataview_rowAOI(_node)
 
 	// Prevent the browser from selecting the content of the element, when
 	// a special key is pressed.
-	jQuery(_node).mousedown(egwPreventSelect);
+	//Seems not to be necessary in nextmatch anymore
+	//_node.addEventListener("mousedown",egwPreventSelect);
 
 	/**
 	 * Now append some action code to the node