diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index f52b90e80f..3c227fc04e 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -831,10 +831,12 @@ class MachineManager(QObject):
         return self._default_extruder_position
 
     ##  This will fire the propertiesChanged for all settings so they will be updated in the front-end
+    @pyqtSlot()
     def forceUpdateAllSettings(self):
         property_names = ["value", "resolve"]
-        for setting_key in self._global_container_stack.getAllKeys():
-            self._global_container_stack.propertiesChanged.emit(setting_key, property_names)
+        for container in [self._global_container_stack] + list(self._global_container_stack.extruders.values()):
+            for setting_key in container.getAllKeys():
+                container.propertiesChanged.emit(setting_key, property_names)
 
     @pyqtSlot(int, bool)
     def setExtruderEnabled(self, position: int, enabled) -> None:
diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index f941ef87b4..b12f8f8696 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -382,6 +382,11 @@ Cura.MachineAction
                             property string settingKey: "machine_nozzle_size"
                             property string label: catalog.i18nc("@label", "Nozzle size")
                             property string unit: catalog.i18nc("@label", "mm")
+                            function afterOnEditingFinished()
+                            {
+                                // Somehow the machine_nozzle_size dependent settings are not updated otherwise
+                                Cura.MachineManager.forceUpdateAllSettings()
+                            }
                             property bool isExtruderSetting: true
                         }
 
@@ -889,4 +894,4 @@ Cura.MachineAction
         watchedProperties: [ "value" ]
         storeIndex: manager.containerIndex
     }
-}
\ No newline at end of file
+}