diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py
index e0c43c4876c..72e7d539ced 100755
--- a/cura/BuildVolume.py
+++ b/cura/BuildVolume.py
@@ -289,7 +289,7 @@ def updateNodeBoundaryCheck(self):
                 # Mark the node as outside build volume if the set extruder is disabled
                 extruder_position = node.callDecoration("getActiveExtruderPosition")
                 try:
-                    if not self._global_container_stack.extruderList[int(extruder_position)].isEnabled:
+                    if not self._global_container_stack.extruderList[int(extruder_position)].isEnabled and not node.callDecoration("isGroup"):
                         node.setOutsideBuildArea(True)
                         continue
                 except IndexError:  # Happens when the extruder list is too short. We're not done building the printer in memory yet.
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index d8e17ec3057..b172d92d006 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1191,7 +1191,7 @@ def _setQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup")
 
         self.setIntentByCategory(quality_changes_group.intent_category)
         self._reCalculateNumUserSettings()
-
+        self.correctExtruderSettings()
         self.activeQualityGroupChanged.emit()
         self.activeQualityChangesGroupChanged.emit()