diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
index 98d7af330..34727be75 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
@@ -107,6 +107,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
 
         // Clear components
         bdQualityForms.clear();
+        Util.createBindingsFor(self);
         Util.reloadBindings(self);
         reloadTaskQualityForms();
     }
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 3243cbb13..9161081c7 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
@@ -270,8 +270,6 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void setupEditControllers() throws Exception {
         Component comp = self;
-
-        setupAssignedTaskQualityFormsToOrderElementController(comp);
         setupOrderAuthorizationController(comp);
     }
 
@@ -376,12 +374,15 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private AssignedTaskQualityFormsToOrderElementController assignedTaskQualityFormController;
 
-    private void setupAssignedTaskQualityFormsToOrderElementController(
-            Component comp) throws Exception {
-        Component orderElementTaskQualityForms = editWindow
+    public void setupAssignedTaskQualityFormsToOrderElementController() throws Exception {
+        if (assignedTaskQualityFormController == null) {
+            Component orderElementTaskQualityForms = editWindow
                 .getFellowIfAny("orderElementTaskQualityForms");
-        assignedTaskQualityFormController = (AssignedTaskQualityFormsToOrderElementController) orderElementTaskQualityForms
+            assignedTaskQualityFormController = (AssignedTaskQualityFormsToOrderElementController) orderElementTaskQualityForms
                 .getVariable("assignedTaskQualityFormsController", true);
+            final IOrderElementModel orderElementModel = getOrderElementModel();
+            assignedTaskQualityFormController.openWindow(orderElementModel);
+        }
     }
 
     private OrderAuthorizationController orderAuthorizationController;
@@ -457,7 +458,8 @@ public class OrderCRUDController extends GenericForwardComposer {
                 && (!assignedCriterionRequirementController.close())) {
             selectTab("tabRequirements");
         }
-        if (!assignedTaskQualityFormController.confirm()) {
+        if ((assignedTaskQualityFormController != null)
+                && (!assignedTaskQualityFormController.confirm())) {
             selectTab("tabTaskQualityForm");
             return false;
         }
@@ -660,7 +662,9 @@ public class OrderCRUDController extends GenericForwardComposer {
             assignedMaterialsController.openWindow(orderElementModel
                     .getOrderElement());
         }
-        assignedTaskQualityFormController.openWindow(orderElementModel);
+        if (assignedTaskQualityFormController != null) {
+            assignedTaskQualityFormController.openWindow(orderElementModel);
+        }
     }
 
     private void clearEditWindow() {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 33a390233..398594ab1 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -47,7 +47,8 @@
                 onSelect = "controller.setupAssignedCriterionRequirementsToOrderElementController();"/>
             <tab id="tabMaterials" label="${i18n:_('Materials')}"
                 onSelect = "controller.setupAssignedMaterialsToOrderElementController();"/>
-            <tab id="tabTaskQualityForm" label="${i18n:_('Task quality forms')}" />
+            <tab id="tabTaskQualityForm" label="${i18n:_('Task quality forms')}"
+                onSelect = "controller.setupAssignedTaskQualityFormsToOrderElementController();"/>
             <tab id="tabAuthorizations" label="${i18n:_('Authorizations')}" />
         </tabs>
         <tabpanels>
@@ -171,7 +172,7 @@
                 <listOrderElementMaterials id="orderElementMaterials" fulfill="tabMaterials.onSelect"/>
             </tabpanel>
             <tabpanel>
-                <listOrderElementTaskQualityForms id="orderElementTaskQualityForms" />
+                <listOrderElementTaskQualityForms id="orderElementTaskQualityForms" fulfill="tabTaskQualityForm.onSelect"/>
             </tabpanel>
             <tabpanel>
                 <listOrderElementAuthorizations id="orderElementAuthorizations"/>