diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index bdb71aed9..d5e4c3a8d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -653,7 +653,7 @@ public class MachineCRUDController extends GenericForwardComposer {
                 final Machine machine = (Machine) data;
                 row.setValue(machine);
 
-                row.addEventListener(Events.ON_DOUBLE_CLICK,
+                row.addEventListener(Events.ON_CLICK,
                         new EventListener() {
                             @Override
                             public void onEvent(Event event) throws Exception {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 5efd4a72b..b67cee425 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -838,7 +838,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
                 final Worker worker = (Worker) data;
                 row.setValue(worker);
 
-                row.addEventListener(Events.ON_DOUBLE_CLICK,
+                row.addEventListener(Events.ON_CLICK,
                         new EventListener() {
                             @Override
                             public void onEvent(Event event) throws Exception {
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
index ccb846803..dca0c2c9b 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
@@ -29,7 +29,7 @@
         <newdatasortablecolumn width="200px" label="${i18n:_('Operations')}"/>
     </columns>
     <rows>
-        <row self="@{each='criterionType'}" value="@{criterionType}" onDoubleClick="controller.goToEditForm(self.value);">
+        <row self="@{each='criterionType'}" value="@{criterionType}" onClick="controller.goToEditForm(self.value);">
             <label value="@{criterionType.name}" tooltiptext="@{criterionType.description}"/>
             <label value="@{criterionType.code}"/>
             <label value="@{criterionType.resource}"/>