diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py
index c075f6895b..e7b182c670 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py
@@ -55,20 +55,27 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
 
         # Add all instances that are not added, but are in visibility list
         for item in visible:
-            if not settings.getInstance(item):
+            if not settings.getInstance(item): # Setting was not added already.
                 definition = self._stack.getSettingDefinition(item)
                 if definition:
                     new_instance = SettingInstance(definition, settings)
                     stack_nr = -1
-                    if definition.limit_to_extruder and self._stack.getProperty("machine_extruder_count", "value") > 1:
-                        #Obtain the value from the correct container stack. Only once, upon adding the setting.
-                        stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder"))))) #Stack to get the setting from. Round it and remove the fractional part.
-                    if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value") is not None: #Property not defined, but we have an extruder number.
+                    # Check from what stack we should copy the raw property of the setting from.
+                    if definition.limit_to_extruder != "-1" and self._stack.getProperty("machine_extruder_count", "value") > 1:
+                        # A limit to extruder function was set and it's a multi extrusion machine. Check what stack we do need to use.
+                        stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder")))))
+
+                    # Check if the found stack_number is in the extruder list of extruders.
+                    if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value") is not None:
                         stack_nr = str(int(round(float(self._stack.getProperty("extruder_nr", "value")))))
-                    if stack_nr in ExtruderManager.getInstance().extruderIds: #We have either a limit_to_extruder or an extruder_nr.
+
+                    # Use the found stack number to get the right stack to copy the value from.
+                    if stack_nr in ExtruderManager.getInstance().extruderIds:
                         stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0]
                     else:
                         stack = UM.Application.getInstance().getGlobalContainerStack()
+
+                    # Use the raw property to set the value (so the intheritance doesn't break)
                     new_instance.setProperty("value", stack.getRawProperty(item, "value"))
                     new_instance.resetState()  # Ensure that the state is not seen as a user state.
                     settings.addInstance(new_instance)