diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index 4d7b8b14c..ad0f0f9a2 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -703,6 +703,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         if (orderElementTreeController != null) {
             orderElementTreeController.resetCellsMarkedAsModified();
         }
+        initialStatus = ((Order) orderModel.getOrder()).getState();
         updateDisabilitiesOnInterface();
         refreshCodeTextboxesOnly();
         getVisibility().showOnly(editWindow);
@@ -964,6 +965,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void prepareEditWindow() {
         addEditWindowIfNecessary();
+        initialStatus = ((Order) orderModel.getOrder()).getState();
         updateDisabilitiesOnInterface();
         setupOrderElementTreeController();
         selectDefaultTab();
@@ -1450,8 +1452,6 @@ public class OrderCRUDController extends GenericForwardComposer {
     private void updateDisabilitiesOnInterface() {
         Order order = (Order) orderModel.getOrder();
 
-        initialStatus = order.getState();
-
         boolean permissionForWriting = orderModel.userCanWrite(order,
                 SecurityUtils.getSessionUserLoginName());
         boolean isInStoredState = order.getState() == OrderStatusEnum.STORED;