diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 8ab05e90c1..c89485517e 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -64,24 +64,26 @@ Item {
                         settingLoader.item.doDepthIdentation = false
                     }
 
-                    source:
+                    sourceComponent:
                     {
-                        switch(model.type) // TODO: This needs to be fixed properly. Got frustrated with it not working, so this is the patch job!
+                        switch(model.type)
                         {
                             case "int":
-                                return "../../resources/qml/Settings/SettingTextField.qml"
+                                return settingTextField
                             case "float":
-                                return "../../resources/qml/Settings/SettingTextField.qml"
+                                return settingTextField
                             case "enum":
-                                return "../../resources/qml/Settings/SettingComboBox.qml"
+                                return settingComboBox
+                            case "extruder":
+                                return settingExtruder
                             case "bool":
-                                return "../../resources/qml/Settings/SettingCheckBox.qml"
+                                return settingCheckBox
                             case "str":
-                                return "../../resources/qml/Settings/SettingTextField.qml"
+                                return settingTextField
                             case "category":
-                                return "../../resources/qml/Settings/SettingCategory.qml"
+                                return settingCategory
                             default:
-                                return "../../resources/qml/Settings/SettingUnknown.qml"
+                                return settingUnknown
                         }
                     }
                 }
@@ -257,4 +259,46 @@ Item {
     }
 
     SystemPalette { id: palette; }
+
+    Component
+    {
+        id: settingTextField;
+
+        Cura.SettingTextField { }
+    }
+
+    Component
+    {
+        id: settingComboBox;
+
+        Cura.SettingComboBox { }
+    }
+
+    Component
+    {
+        id: settingExtruder;
+
+        Cura.SettingExtruder { }
+    }
+
+    Component
+    {
+        id: settingCheckBox;
+
+        Cura.SettingCheckBox { }
+    }
+
+    Component
+    {
+        id: settingCategory;
+
+        Cura.SettingCategory { }
+    }
+
+    Component
+    {
+        id: settingUnknown;
+
+        Cura.SettingUnknown { }
+    }
 }