diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
index 57e2c248e..70e806995 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
@@ -235,6 +235,8 @@ public class ManageOrderElementAdvancesController extends
         if (advance != null) {
             indexSelectedItem = getAdvanceAssignments().indexOf(advance);
             prepareEditAdvanceMeasurements(advance);
+        } else {
+            selectAdvanceLine(getAdvanceAssignments().size() - 1);
         }
         reloadAdvances();
     }
@@ -1213,6 +1215,14 @@ public class ManageOrderElementAdvancesController extends
         messagesForUser.showMessage(Level.ERROR, message);
     }
 
+    public void refreshSelectedAdvance() {
+        if ((indexSelectedItem < 0)
+                || (indexSelectedItem >= getAdvanceAssignments().size())) {
+            selectSpreadAdvanceLine();
+        }
+        selectAdvanceLine(indexSelectedItem);
+    }
+
     private void showMessageDeleteSpread() {
         String message = _("This advance can not be removed, because is spread. it is necessary to select another advance as spread..");
         increaseScreenHeight();
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 258d09cb7..2fcfb1221 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
@@ -327,6 +327,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         } else {
             manageOrderElementAdvancesController.refreshChangesFromOrderElement();
             manageOrderElementAdvancesController.createAndLoadBindings();
+            manageOrderElementAdvancesController.refreshSelectedAdvance();
         }
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index 263e2fc7a..13effee4e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -131,6 +131,7 @@ public class OrderElementController extends GenericForwardComposer {
             manageOrderElementAdvancesController
                     .refreshChangesFromOrderElement();
             manageOrderElementAdvancesController.createAndLoadBindings();
+            manageOrderElementAdvancesController.refreshSelectedAdvance();
         }
     }