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 481ab4651..87f587d33 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
@@ -402,8 +402,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         if (!assignedCriterionRequirementController.close()) {
             selectTab("tabRequirements");
         }
-        selectTab("tabTaskQualityForm");
         if (!assignedTaskQualityFormController.confirm()) {
+            selectTab("tabTaskQualityForm");
             return false;
         }
         try {