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 c3c3e7a55..ca793a684 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
@@ -408,11 +408,12 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     public void goToEditForm(Order order) {
         planningControllerEntryPoints.goToOrderDetails(order);
-        orderAuthorizationController.setOrder(order);
     }
 
     public void initEdit(Order order) {
         orderModel.initEdit(order);
+        addEditWindowIfNeeded();
+        orderAuthorizationController.setOrder(order);
         showEditWindow(_("Edit order"));
     }