diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
index 1b41ef92d..0c0634ec9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
@@ -80,7 +80,7 @@ public interface IOrderModel {
 
     boolean isAlreadyScheduled(Order order);
 
-    void prepareEditFor(Order order);
+    void initEdit(Order order);
 
     void prepareForCreate();
 
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 db43a63d6..3a259e3f2 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
@@ -149,12 +149,22 @@ public class OrderCRUDController extends GenericForwardComposer {
         return orderModel.getOrder();
     }
 
-    public void save() {
+    public void saveAndContinue() {
+        save();
+        orderModel.initEdit((Order) orderModel.getOrder());
+        initializeTabs();
+    }
+
+    public void saveAndExit() {
+        save();
+        goToList();
+    }
+
+    private void save() {
         try {
             manageOrderElementAdvancesController.save();
             orderModel.save();
             messagesForUser.showMessage(Level.INFO, _("Order saved"));
-            goToList();
         } catch (ValidationException e) {
             if (e.getInvalidValues().length == 0) {
                 messagesForUser.showMessage(Level.INFO, e.getMessage());
@@ -260,7 +270,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     private Runnable onUp;
 
     public void goToEditForm(Order order) {
-        orderModel.prepareEditFor(order);
+        orderModel.initEdit(order);
         showEditWindow(_("Edit order"));
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index 17fec6b16..39d2194f9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -144,7 +144,7 @@ public class OrderModel implements IOrderModel {
 
     @Override
     @Transactional(readOnly = true)
-    public void prepareEditFor(Order order) {
+    public void initEdit(Order order) {
         Validate.notNull(order);
         initializeCacheLabels();
         loadCriterions();
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index a88d5cf13..e2404b348 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -96,7 +96,9 @@
             </tabpanel>
         </tabpanels>
     </tabbox>
-
-    <button label="${i18n:_('Save')}" onClick="controller.save()" />
-    <button label="${i18n:_('Cancel')}" onClick="controller.cancel()" />
+    <hbox>
+        <button label="${i18n:_('Save')}" onClick="controller.saveAndExit()" />
+        <button label="${i18n:_('Save &amp; Continue')}" onClick="controller.saveAndContinue()" />
+        <button label="${i18n:_('Cancel')}" onClick="controller.cancel()" />
+    </hbox>
 </window>