diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 7e588574d8..e3f0bd6241 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -274,38 +274,18 @@ class MachineManagerModel(QObject):
         return containers[0].isReadOnly()
 
     @pyqtSlot(result = str)
-    def convertUserContainerToQuality(self):
-        if not self._global_container_stack:
+    def newQualityContainerFromQualityAndUser(self):
+        new_container_id = self.duplicateContainer(self.activeQualityId)
+        if new_container_id == "":
             return
+        self.setActiveQuality(new_container_id)
+        self.updateQualityContainerFromUserContainer()
 
-        new_quality_container = InstanceContainer("")
-        name = self._createUniqueName("quality", "", self.activeQualityName, catalog.i18nc("@label", "Custom profile"))
-        user_settings = self._global_container_stack.getTop()
-
-        ## Copy all values
-        new_quality_container.deserialize(user_settings.serialize())
-
-        ## If the currently active machine does not have quality profiles of its own,
-        #  make the new quality profile available for all machines that don't have
-        #  unique quality profiles (including the current machine)
-        if not self.filterQualityByMachine:
-            new_quality_container.setDefinition(UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter")[0])
-
-        ## Change type / id / name
-        new_quality_container.setMetaDataEntry("type", "quality")
-        new_quality_container.setReadOnly(False)
-        new_quality_container.setName(name)
-        new_quality_container._id = name
-
-        UM.Settings.ContainerRegistry.getInstance().addContainer(new_quality_container)
-        self.clearUserSettings()  # As all users settings are now transfered to the new quality profile, remove them.
-        self.setActiveQuality(name)
-        return name
 
     @pyqtSlot(str, result=str)
     def duplicateContainer(self, container_id):
         if not self._global_container_stack:
-            return
+            return ""
         containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=container_id)
         if containers:
             new_name = self._createUniqueName("quality", "", containers[0].getName(), catalog.i18nc("@label", "Custom profile"))
@@ -364,7 +344,7 @@ class MachineManagerModel(QObject):
 
 
     @pyqtSlot()
-    def updateUserContainerToQuality(self):
+    def updateQualityContainerFromUserContainer(self):
         if not self._global_container_stack:
             return
         user_settings = self._global_container_stack.getTop()
diff --git a/cura/SettingOverrideDecorator.py b/cura/SettingOverrideDecorator.py
index 23730fee60..7417e47bf2 100644
--- a/cura/SettingOverrideDecorator.py
+++ b/cura/SettingOverrideDecorator.py
@@ -8,6 +8,7 @@ from UM.Signal import Signal, signalemitter
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.ContainerRegistry import ContainerRegistry
+import UM.Logger
 
 from UM.Application import Application
 
@@ -58,7 +59,11 @@ class SettingOverrideDecorator(SceneNodeDecorator):
     #   kept up to date.
     def _updateNextStack(self):
         if self._extruder_stack:
-            self._stack.setNextStack(ContainerRegistry.getInstance().findContainerStack(id = self._extruder_stack))
+            extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = self._extruder_stack)
+            if extruder_stack:
+                self._stack.setNextStack(extruder_stack)
+            else:
+                UM.Logger.log("e", "Extruder stack %s below per-object settings does not exist.", self._extruder_stack)
         else:
             self._stack.setNextStack(Application.getInstance().getGlobalContainerStack())
 
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 03158266f5..502e903416 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -101,7 +101,7 @@ Item {
                     }
                 }
 
-                onActivated: UM.ActiveTool.properties.setValue("SelectedActiveExtruder", extruders_model.getItem(index).id);
+                onActivated: UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(index).id);
                 onModelChanged: updateCurrentIndex();
 
                 function updateCurrentIndex()
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
index 255277c3af..395dbdc594 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
@@ -5,7 +5,7 @@ from UM.Tool import Tool
 from UM.Scene.Selection import Selection
 from UM.Application import Application
 from UM.Preferences import Preferences
-
+from cura.SettingOverrideDecorator import SettingOverrideDecorator
 
 ##  This tool allows the user to add & change settings per node in the scene.
 #   The settings per object are kept in a ContainerStack, which is linked to a node by decorator.
@@ -55,6 +55,9 @@ class PerObjectSettingsTool(Tool):
     #   selected object with.
     def setSelectedActiveExtruder(self, extruder_stack_id):
         selected_object = Selection.getSelectedObject(0)
+        stack = selected_object.callDecoration("getStack") #Don't try to get the active extruder since it may be None anyway.
+        if not stack:
+            selected_object.addDecorator(SettingOverrideDecorator())
         selected_object.callDecoration("setActiveExtruder", extruder_stack_id)
 
     def _onPreferenceChanged(self, preference):
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index e09b6b5424..3ef40644d2 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -112,7 +112,7 @@ Item
         id: updateProfileAction;
         enabled: Cura.MachineManager.isGlobalStackValid && Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
         text: catalog.i18nc("@action:inmenu menubar:profile","&Update Current Profile");
-        onTriggered: Cura.MachineManager.updateUserContainerToQuality()
+        onTriggered: Cura.MachineManager.updateQualityContainerFromUserContainer()
     }
 
     Action
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index a1023d8ef2..547f05d056 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -582,7 +582,7 @@ UM.MainWindow
         target: Cura.Actions.addProfile
         onTriggered:
         {
-            Cura.MachineManager.convertUserContainerToQuality();
+            Cura.MachineManager.newQualityContainerFromQualityAndUser();
             preferences.setPage(5);
             preferences.show();
 
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index cd37df3cc5..71afdd98ac 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -65,7 +65,7 @@ UM.ManagementPage
     onAddObject: {
         var selectedContainer;
         if (objectList.currentItem.id == Cura.MachineManager.activeQualityId) {
-            selectedContainer = Cura.MachineManager.convertUserContainerToQuality();
+            selectedContainer = Cura.MachineManager.newQualityContainerFromQualityAndUser();
         } else {
             selectedContainer = Cura.MachineManager.duplicateContainer(base.currentItem.id);
         }
@@ -121,7 +121,7 @@ UM.ManagementPage
                     return catalog.i18nc("@action:button", "Update \"%1\"".arg(profileName));
                 }
                 enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
-                onClicked: Cura.MachineManager.updateUserContainerToQuality()
+                onClicked: Cura.MachineManager.updateQualityContainerFromUserContainer()
             }
 
             Button