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 c7f54dcc5..088d2487c 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
@@ -174,6 +174,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         showOrderElementFilter();
         showCreateButtons(false);
         orderModel.prepareCreationFrom(template);
+        addEditWindowIfNecessary();
         showEditWindow(_("Create order from Template"));
     }
 
@@ -256,6 +257,12 @@ public class OrderCRUDController extends GenericForwardComposer {
         Util.reloadBindings(editOrderElementWindow);
     }
 
+    private void addEditWindowIfNecessary() {
+        if (editWindow == null) {
+            addEditWindow();
+        }
+    }
+
     private void addEditWindow() {
         if (editWindow != null) {
             return;