diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 22ae244286..1198f4523d 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -132,15 +132,15 @@ class CuraApplication(QtApplication):
         Resources.addStorageType(self.ResourceTypes.QualityInstanceContainer, "quality")
         Resources.addStorageType(self.ResourceTypes.VariantInstanceContainer, "variants")
         Resources.addStorageType(self.ResourceTypes.MaterialInstanceContainer, "materials")
-        Resources.addStorageType(self.ResourceTypes.ExtruderStack, "extruders")
         Resources.addStorageType(self.ResourceTypes.UserInstanceContainer, "user")
+        Resources.addStorageType(self.ResourceTypes.ExtruderStack, "extruders")
         Resources.addStorageType(self.ResourceTypes.MachineStack, "machine_instances")
 
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityInstanceContainer)
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.VariantInstanceContainer)
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.MaterialInstanceContainer)
-        ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.ExtruderStack)
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.UserInstanceContainer)
+        ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.ExtruderStack)
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.MachineStack)
 
         # Add empty variant, material and quality containers.
diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 1423744263..50098dfa1b 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -158,6 +158,7 @@ class MachineManagerModel(QObject):
                     current_settings_container_extruder.addMetaDataEntry("machine", name)
                     current_settings_container_extruder.addMetaDataEntry("type", "user")
                     current_settings_container_extruder.setDefinition(definition)
+                    UM.Settings.ContainerRegistry.getInstance().addContainer(current_settings_container_extruder)
                     extruder_train_stack.addContainer(current_settings_container_extruder)
                     extruder_train_stack.setNextStack(new_global_stack)
                     UM.Settings.ContainerRegistry.getInstance().addContainer(extruder_train_stack)