diff --git a/addons/mrp/models/res_config_settings.py b/addons/mrp/models/res_config_settings.py
index f9a7ad0b5b5..f7916960643 100644
--- a/addons/mrp/models/res_config_settings.py
+++ b/addons/mrp/models/res_config_settings.py
@@ -35,3 +35,7 @@ class ResConfigSettings(models.TransientModel):
     def _onchange_use_manufacturing_lead(self):
         if not self.use_manufacturing_lead:
             self.manufacturing_lead = 0.0
+
+    @api.onchange('group_mrp_routings')
+    def _onchange_group_mrp_routings(self):
+        self.module_quality_mrp = self.group_mrp_routings
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 8dd8136d5a3..75a3d09ac24 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -13,7 +13,8 @@
                         <div class="row mt16 o_settings_container">
                             <div class="col-md-6 col-xs-12 o_setting_box" id="work_order" title="Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.">
                                 <div class="o_setting_left_pane">
-                                    <field name="group_mrp_routings"/>
+                                    <field name="group_mrp_routings" widget="upgrade_boolean"/>
+                                    <field name="module_quality_mrp" invisible="1"/>
                                 </div>
                                 <div class="o_setting_right_pane">
                                     <label for="group_mrp_routings"/>
@@ -32,17 +33,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-6 col-xs-12 o_setting_box" id="mrp_quality">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_quality_mrp" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_quality_mrp"/>
-                                    <div class="text-muted">
-                                        Manage quality control points, quality checks and quality alerts
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-md-6 col-xs-12 o_setting_box" id="mrp_repair">
                                 <div class="o_setting_left_pane">
                                     <field name="module_mrp_repair"/>