diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
index 10dc05d48..37a4ec46f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
@@ -158,11 +158,10 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
         return newConstraint;
     }
 
-    public void save() {
+    private void save() {
         try {
             advanceTypeModel.save();
             messagesForUser.showMessage(Level.INFO, _("Advance type saved"));
-            goToList();
         } catch (ValidationException e) {
             messagesForUser.showInvalidValues(e);
         }
@@ -252,4 +251,13 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
         return advanceTypeModel.getPercentage();
     }
 
+    public void saveAndExit() {
+        save();
+        goToList();
+    }
+
+    public void saveAndContinue() {
+        save();
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
index 8cf28d5e8..c34bf586f 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
@@ -65,9 +65,12 @@
         </tabpanels>
     </tabbox>
 
-    <button onClick="controller.save();"
+    <button onClick="controller.saveAndExit();"
         label="${arg.save_button_label}"
         sclass="save-button global-action"/>
+    <button onClick="controller.saveAndContinue();"
+        label="${arg.save_and_continue_button_label}"
+        sclass="save-button global-action"/>
     <button onClick="controller.cancel();"
         label="${arg.cancel_button_label}"
         sclass="cancel-button global-action" />
diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
index dc4c5eef9..680d0ff9d 100644
--- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
@@ -34,9 +34,11 @@
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
         <edition top_id="createWindow" title="${i18n:_('Create new advance type')}"
-            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
+            save_and_continue_button_label="${i18n:_('Save &amp; Continue')}" />
         <edition top_id="editWindow" title="${i18n:_('Edit advance type data')}"
-            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
+            save_and_continue_button_label="${i18n:_('Save &amp; Continue')}" />
         <window visible="@{controller.confirmingRemove}"
             id="confirmRemove" title="${i18n:_('Confirm')}" sizable="true"
             position="center">