diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index 4d300aabc..39478ec2b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -263,7 +263,7 @@ public class OrderElementController extends GenericForwardComposer {
         Util.reloadBindings(self.getParent());
     }
 
-    public void onClose(Event event) {
+    public void close(Event event) {
         closeAll();
         event.stopPropagation();
     }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index de21285d4..64a313969 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -31,9 +31,14 @@
     macroURI="/orders/components/_listOrderElementMaterials.zul"?>
 <?component name="listOrderElementTaskQualityForms" inline="true" macroURI="_listOrderElementTaskQualityForms.zul"?>
 
-<window id="${arg.top_id}" title="@{i18n:_('Edit task')}"
-    width="950px" left="50px" top="50px"
-    closable="true" visible="false">
+<window id="${arg.top_id}"
+    title="@{i18n:_('Edit task')}"
+    width="950px"
+    left="50px"
+    top="50px"
+    visible="false"
+    closable="true"
+    onClose="orderElementController.close(event)" >
 
     <tabbox height="620px" id="tabboxOrderElement">
         <tabs>