diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py
index c436f94421..d7d1ee2710 100644
--- a/cura/Machines/Models/IntentCategoryModel.py
+++ b/cura/Machines/Models/IntentCategoryModel.py
@@ -46,9 +46,19 @@ class IntentCategoryModel(ListModel):
         self.addRoleName(self.WeightRole, "weight")
         self.addRoleName(self.QualitiesRole, "qualities")
 
+        application = cura.CuraApplication.CuraApplication.getInstance()
+
         ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange)
         ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange)
-        cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.update)
+
+        machine_manager = application.getMachineManager()
+        machine_manager.globalContainerChanged.connect(self.update)
+        machine_manager.activeQualityGroupChanged.connect(self.update)
+        machine_manager.activeStackChanged.connect(self.update)
+        machine_manager.extruderChanged.connect(self.update)
+
+        extruder_manager = application.getExtruderManager()
+        extruder_manager.extrudersChanged.connect(self.update)
 
         self.update()
 
diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py
index 9bf1cc08a8..92ea0c205f 100644
--- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py
+++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py
@@ -43,6 +43,9 @@ class QualityProfilesDropDownMenuModel(ListModel):
         machine_manager.activeStackChanged.connect(self._onChange)
         machine_manager.extruderChanged.connect(self._onChange)
 
+        extruder_manager = application.getExtruderManager()
+        extruder_manager.extrudersChanged.connect(self._onChange)
+
         self._layer_height_unit = ""  # This is cached
 
         self._update_timer = QTimer()  # type: QTimer