diff --git a/cura/Settings/ExtrudersModel.py b/cura/Settings/ExtrudersModel.py
index af3cb62406..6681cc23f0 100644
--- a/cura/Settings/ExtrudersModel.py
+++ b/cura/Settings/ExtrudersModel.py
@@ -105,8 +105,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
 
     def _onExtruderStackContainersChanged(self, container):
         # The ExtrudersModel needs to be updated when the material-name or -color changes, because the user identifies extruders by material-name
-        if container.getMetaDataEntry("type") == "material":
-            self._updateExtruders()
+        self._updateExtruders()
 
     modelChanged = pyqtSignal()
 
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 94c37a885e..8634a9dba3 100644
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -286,13 +286,10 @@ class MachineManager(QObject):
 
     def _onInstanceContainersChanged(self, container):
         container_type = container.getMetaDataEntry("type")
-        
-        if container_type == "material":
-            self.activeMaterialChanged.emit()
-        elif container_type == "variant":
-            self.activeVariantChanged.emit()
-        elif container_type == "quality":
-            self.activeQualityChanged.emit()
+
+        self.activeVariantChanged.emit()
+        self.activeMaterialChanged.emit()
+        self.activeQualityChanged.emit()
 
         self._updateStacksHaveErrors()