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 67fe6135a..7614f6d4f 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
@@ -576,6 +576,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     private void refreshOrderWindow() {
+        orderElementTreeController.resetCellsMarkedAsModified();
         updateDisabilitiesOnInterface();
         refreshCodeTextboxesOnly();
         getVisibility().showOnly(editWindow);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
index 1932cdffb..8cbf6d2f3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
@@ -641,6 +641,8 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
 
     protected abstract String createTooltipText(T currentElement);
 
+    protected Set<Treecell> cellsMarkedAsModified = new HashSet<Treecell>();
+
     protected void markModifiedTreeitem(Treerow item) {
         Treecell tc = (Treecell) item.getFirstChild();
         // Check if marked label has been previously added
@@ -649,9 +651,17 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
             modifiedMark.setTooltiptext(_("Modified"));
             modifiedMark.setSclass("modified-mark");
             tc.appendChild(modifiedMark);
+            cellsMarkedAsModified.add(tc);
         }
     }
 
+    public void resetCellsMarkedAsModified() {
+        for(Treecell cell : cellsMarkedAsModified) {
+            cell.removeChild(cell.getLastChild());
+        }
+        cellsMarkedAsModified.clear();
+    }
+
     protected boolean readOnly = true;
 
     public void setReadOnly(boolean readOnly) {