diff --git a/cura/ExtruderManager.py b/cura/ExtruderManager.py
index aae90afdc5..8c467ede00 100644
--- a/cura/ExtruderManager.py
+++ b/cura/ExtruderManager.py
@@ -61,6 +61,38 @@ class ExtruderManager(QObject):
         self._active_extruder_index = index
         self.activeExtruderChanged.emit()
 
+    ##  Adds all extruders of a specific machine definition to the extruder
+    #   manager.
+    #
+    #   \param machine_definition The machine to add the extruders for.
+    def addMachineExtruders(self, machine_definition):
+        machine_id = machine_definition.getId()
+        if not self._extruder_trains[machine_id]:
+            self._extruder_trains[machine_id] = { }
+
+        container_registry = UM.Settings.ContainerRegistry.getInstance()
+        if not container_registry: #Then we shouldn't have any machine definition either. In any case, there are no extruder trains then so bye bye.
+            return
+
+        #Add the extruder trains that don't exist yet.
+        for position, extruder_definition_id in machine_definition.getMetaDataEntry("machine_extruder_trains", default = {}).items():
+            extruder_definition = container_registry.findDefinitionContainers(id = extruder_definition_id)
+            if extruder_definition:
+                extruder_definition = extruder_definition[0]
+            else:
+                Logger.log("w", "Machine %s references an extruder with ID %s, which doesn't exist.", machine_definition.getName(), extruder_definition_id)
+                continue
+            name = self._uniqueName(extruder_definition_id) #Make a name based on the ID of the definition.
+            if not container_registry.findContainerStacks(id = name): #Doesn't exist yet.
+                self.createExtruderTrain(extruder_definition, machine_definition, name, position)
+
+        #Gets the extruder trains that we just created as well as any that still existed.
+        extruder_trains = container_registry.findContainerStacks(type = "extruder_train", machine = machine_definition.getId())
+        for extruder_train in extruder_trains:
+            self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train.getId()
+        if extruder_trains:
+            self.extrudersChanged.emit()
+
     ##  (Re)populates the collections of extruders by machine.
     def _repopulate(self):
         self._extruder_trains = { }
@@ -78,13 +110,14 @@ class ExtruderManager(QObject):
             self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train.getId()
         self.extrudersChanged.emit()
 
-    def createExtruderTrain(self, extruder_definition, machine_definition, extruder_id):
+    def createExtruderTrain(self, extruder_definition, machine_definition, extruder_train_id, position):
         container_registry = UM.Settings.ContainerRegistry.getInstance()
 
         #Create a container stack for this extruder.
-        name = self._uniqueName(extruder_id)
-        container_stack = UM.Settings.ContainerStack(name)
+        container_stack = UM.Settings.ContainerStack(extruder_train_id)
         container_stack.addMetaDataEntry("type", "extruder_train")
+        container_stack.addMetaDataEntry("machine", machine_definition.getId())
+        container_stack.addMetaDataEntry("position", position)
         container_stack.addContainer(extruder_definition)
 
         """
@@ -133,7 +166,7 @@ class ExtruderManager(QObject):
         """
 
         #Add an empty user profile.
-        user_profile = UM.Settings.InstanceContainer(name + "_current_settings")
+        user_profile = UM.Settings.InstanceContainer(extruder_train_id + "_current_settings")
         user_profile.addMetaDataEntry("type", "user")
         user_profile.setDefinition(machine_definition)
         container_stack.addContainer(user_profile)
diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 576cf1acc0..86e74e8302 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -135,14 +135,7 @@ class MachineManagerModel(QObject):
                 new_global_stack.addContainer(quality_instance_container)
             new_global_stack.addContainer(current_settings_instance_container)
 
-            for position, extruder_train_id in definition.getMetaDataEntry("machine_extruder_trains", default = {}).items():
-                extruder_definition = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = extruder_train_id)
-                if extruder_definition:
-                    extruder_definition = extruder_definition[0]
-                else:
-                    Logger.log("w", "Machine %s references an extruder with ID %s, which doesn't exist.", definition.getName(), extruder_train_id)
-                    continue
-                ExtruderManager.ExtruderManager.getInstance().createExtruderTrain(extruder_definition, definition, extruder_train_id)
+            ExtruderManager.ExtruderManager.getInstance().addMachineExtruders(definition)
 
             Application.getInstance().setGlobalContainerStack(new_global_stack)