diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 139e5bdc9..d0a30a732 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -42,6 +42,7 @@ import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.OnlyOneVisible;
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
+import org.navalplanner.web.orders.materials.MaterialAssignmentsComponent;
 import org.navalplanner.web.planner.order.IOrderPlanningGate;
 import org.navalplanner.web.tree.TreeComponent;
 import org.navalplanner.web.users.OrderAuthorizationController;
@@ -230,10 +231,9 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void setupAssignedMaterialsToOrderElementController(
             Component comp) throws Exception {
-        Component orderElementMaterials = editWindow
+        MaterialAssignmentsComponent assignmentsComponent = (MaterialAssignmentsComponent) editWindow
                 .getFellowIfAny("orderElementMaterials");
-        assignedMaterialsController = (AssignedMaterialsToOrderElementController) orderElementMaterials
-                .getVariable("assignedMaterialsController", true);
+        assignedMaterialsController = assignmentsComponent.getController();
     }
 
     private AssignedTaskQualityFormsToOrderElementController assignedTaskQualityFormController;
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 d6328b916..e128fd663 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
@@ -26,6 +26,7 @@ import org.navalplanner.business.orders.entities.OrderLine;
 import org.navalplanner.business.orders.entities.OrderLineGroup;
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
+import org.navalplanner.web.orders.materials.MaterialAssignmentsComponent;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.SuspendNotAllowedException;
 import org.zkoss.zk.ui.event.Event;
@@ -115,9 +116,10 @@ public class OrderElementController extends GenericForwardComposer {
 
     private void setupAssignedMaterialsToOrderElementController(Component comp)
             throws Exception {
-        Component orderElementMaterials = (Component) comp.getFellowIfAny("orderElementMaterials");
-        assignedMaterialsController = (AssignedMaterialsToOrderElementController) orderElementMaterials
-                .getVariable("assignedMaterialsController", true);
+        MaterialAssignmentsComponent assignedMaterialsComponent = (MaterialAssignmentsComponent) comp
+                .getFellowIfAny("orderElementMaterials");
+        assignedMaterialsController = assignedMaterialsComponent
+                .getController();
     }
 
     private void setupAssignedTaskQualityFormsToOrderElementController(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java
new file mode 100644
index 000000000..bde331bd2
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/MaterialAssignmentsComponent.java
@@ -0,0 +1,36 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.navalplanner.web.orders.materials;
+
+import org.zkoss.zk.ui.HtmlMacroComponent;
+
+/**
+ * @author Óscar González Fernández <ogonzalez@igalia.com>
+ *
+ */
+public class MaterialAssignmentsComponent extends HtmlMacroComponent {
+
+    private AssignedMaterialsToOrderElementController controller = new AssignedMaterialsToOrderElementController();
+
+    public AssignedMaterialsToOrderElementController getController() {
+        return controller;
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index bb964e2bf..a71b78594 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -23,7 +23,7 @@
 <?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
 <?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
 <?component name="listOrderElementCriterionRequirements" inline="true" macroURI="_listOrderElementCriterionRequirements.zul"?>
-<?component name="listOrderElementMaterials" inline="true" macroURI="_listOrderElementMaterials.zul"?>
+<?component name="listOrderElementMaterials" class="org.navalplanner.web.orders.materials.MaterialAssignmentsComponent" macroURI="_listOrderElementMaterials.zul"?>
 <?component name="listOrderElementTaskQualityForms" inline="true" macroURI="_listOrderElementTaskQualityForms.zul"?>
 
 <window id="${arg.top_id}" title="${i18n:_('Edit order element')}"
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 62931a101..d99497867 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -24,7 +24,7 @@
 <?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
 <?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
 <?component name="listOrderElementCriterionRequirements" inline="true" macroURI="_listOrderElementCriterionRequirements.zul"?>
-<?component name="listOrderElementMaterials" inline="true" macroURI="_listOrderElementMaterials.zul"?>
+<?component name="listOrderElementMaterials" class="org.navalplanner.web.orders.materials.MaterialAssignmentsComponent" macroURI="_listOrderElementMaterials.zul"?>
 <?component name="listOrderElementTaskQualityForms" inline="true" macroURI="_listOrderElementTaskQualityForms.zul"?>
 <?component name="listOrderElementAuthorizations" inline="true" macroURI="_listOrderElementAuthorizations.zul"?>
 
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
index c84cd6da8..344f50047 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
@@ -17,16 +17,18 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+<zk>
+<zscript><![CDATA[
+    Object[] unitTypes = org.navalplanner.business.materials.entities.UnitTypeEnum
+                            .values();
+    Object[] materialStatus = org.navalplanner.business.materials.entities.MaterialStatusEnum
+                            .values();
+    materialAssignmentComponent = self;
+    assignedMaterialsController = materialAssignmentComponent.controller;
+]]>
+</zscript>
+<vbox apply="${assignedMaterialsController}">
 
-<vbox id="${arg.id}"
-    apply="org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController" >
-
-    <zscript>
-        Object[] unitTypes = org.navalplanner.business.materials.entities.UnitTypeEnum
-            .values();
-        Object[] materialStatus = org.navalplanner.business.materials.entities.MaterialStatusEnum
-            .values();
-    </zscript>
 
     <tabbox mold="accordion">
         <tabs>
@@ -184,3 +186,4 @@
     </tabbox>
 
 </vbox>
+</zk>
\ No newline at end of file