diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
index ef04af055..a835b6018 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
@@ -38,7 +38,7 @@ public class AsignedHoursToOrderElementController extends
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
-        super.doAfterCompose(comp.getFellow("listOrderElementHours"));
+        super.doAfterCompose(comp);
         comp.setVariable("asignedHoursToOrderElementController", this, true);
     }
 
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 8700b7865..fb99ac6be 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
@@ -46,8 +46,6 @@ public class OrderElementController extends GenericForwardComposer {
      */
     private IOrderElementModel orderElementModel;
 
-    private AsignedHoursToOrderElementController asignedHoursController;
-
     private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
 
     private AssignedLabelsToOrderElementController assignedLabelsController;
@@ -56,6 +54,10 @@ public class OrderElementController extends GenericForwardComposer {
 
     private DetailsOrderElementController detailsController;
 
+    private Component orderElementHours;
+
+    private AsignedHoursToOrderElementController assignedHoursController;
+
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
@@ -73,8 +75,8 @@ public class OrderElementController extends GenericForwardComposer {
     }
 
     private void setupAsignedHoursToOrderElementController(Component comp)throws Exception{
-        asignedHoursController = new AsignedHoursToOrderElementController();
-        asignedHoursController.doAfterCompose(comp);
+        assignedHoursController = (AsignedHoursToOrderElementController)
+            orderElementHours.getVariable("asignedHoursToOrderElementController", true);
     }
 
     private void setupAssignedLabelsToOrderElementController(Component comp)
@@ -104,7 +106,7 @@ public class OrderElementController extends GenericForwardComposer {
         setOrderElementModel(model);
 
         detailsController.openWindow(model);
-        asignedHoursController.openWindow(model);
+        assignedHoursController.openWindow(model);
         manageOrderElementAdvancesController.openWindow(model);
         assignedLabelsController.openWindow(model);
 
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index ed6a0b7dd..384e387f0 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -38,7 +38,7 @@
                 <orderElementDetails id="orderElementDetails" />
             </tabpanel>
             <tabpanel>
-                <listOrderElementHours id="listOrderElementHours" />
+                <listOrderElementHours id="orderElementHours" />
             </tabpanel>
             <tabpanel>
                 <listOrderElementAdvances/>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index b7d56bb16..e97cc2dbe 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -19,6 +19,7 @@
 -->
 
 <?component name="orderElementTree" inline="true" macroURI="_orderElementTree.zul"?>
+
 <window id="${arg.top_id}">
     <tabbox>
         <tabs>