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 c2c493bd0..9400e9919 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
@@ -22,9 +22,7 @@ package org.navalplanner.web.orders;
 
 import static org.navalplanner.web.I18nHelper._;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.validator.InvalidValue;
@@ -43,7 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
@@ -113,38 +110,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         super.doAfterCompose(comp);
         messagesForUser = new MessagesForUser(messagesContainer);
         comp.setVariable("controller", this, true);
-    }
+        getVisibility().showOnly(listWindow);
 
-    private void addEditWindowIfNeeded() {
-        if (editWindow != null) {
-            return;
-        }
-        Map<String, Object> editWindowArgs = new HashMap<String, Object>();
-        editWindowArgs.put("top_id", editWindowArgs);
-        Component parent = listWindow.getParent();
-        listWindow.setVisible(false);
-        cachedOnlyOneVisible = null;
-        editWindow = (Window) Executions.createComponents(
-                "/orders/_edition.zul",
-                parent, editWindowArgs);
-        Map<String, Object> editOrderElementArgs = new HashMap<String, Object>();
-        editOrderElementArgs.put("top_id", "editOrderElement");
-        Component editOrderElement = Executions.createComponents(
-                "/orders/_editOrderElement.zul",
-                parent, editOrderElementArgs);
-        try {
-            setupEditControllers();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Util.createBindingsFor(editWindow);
-        Util.reloadBindings(editWindow);
-        Util.createBindingsFor(editOrderElement);
-        Util.reloadBindings(editOrderElement);
-    }
-
-    private void setupEditControllers() throws Exception {
-        Component comp = self;
         OrderElementController orderElementController = new OrderElementController();
         orderElementController.doAfterCompose(comp
                 .getFellow("editOrderElement"));
@@ -225,7 +192,6 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private OnlyOneVisible getVisibility() {
         if (cachedOnlyOneVisible == null) {
-            addEditWindowIfNeeded();
             cachedOnlyOneVisible = new OnlyOneVisible(listWindow, editWindow);
         }
         return cachedOnlyOneVisible;
@@ -346,7 +312,6 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     private void showEditWindow(String title) {
-        addEditWindowIfNeeded();
         clearEditWindow();
         initializeTabs();
         editWindow.setTitle(title);
diff --git a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
index b358a0fed..38ebc49e7 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
@@ -19,6 +19,8 @@
 -->
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
 <?component name="list" inline="true" macroURI="_list.zul"?>
+<?component name="edition" inline="true" macroURI="_edition.zul"?>
+<?component name="orderElement" inline="true" macroURI="_editOrderElement.zul"?>
 <zk>
 <zscript><![CDATA[
     orderController = arg.get("orderController");
@@ -52,6 +54,8 @@
         <div>
             <vbox id="messagesContainer" />
             <list top_id="listWindow" />
+            <edition top_id="editWindow" />
+            <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}" />
             </div>
         </center>
         </borderlayout>