diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml
index 95aed3685c..3175a4e2b3 100644
--- a/resources/qml/ProfileSetup.qml
+++ b/resources/qml/ProfileSetup.qml
@@ -59,7 +59,23 @@ Item{
                     id: profileSelectionInstantiator
                     model: UM.InstanceContainersModel
                     {
-                        filter: {"type": "quality"}
+                        filter:
+                        {
+                            var result = { "type": "quality" };
+                            if(Cura.MachineManager.filterQualityByMachine)
+                            {
+                                result.definition = Cura.MachineManager.activeDefinitionId;
+                                if(Cura.MachineManager.hasMaterials)
+                                {
+                                    result.material = Cura.MachineManager.activeMaterialId;
+                                }
+                            }
+                            else
+                            {
+                                result.definition = "fdmprinter"
+                            }
+                            return result
+                        }
                     }
                     property int separatorIndex: -1
 
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 282fa8af25..4b48584174 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -266,7 +266,23 @@ Item
                         id: materialSelectionInstantiator
                         model: UM.InstanceContainersModel
                         {
-                            filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId }
+                            filter:
+                            {
+                                var result = { "type": "material" }
+                                if(Cura.MachineManager.filterMaterialsByMachine)
+                                {
+//                                     result.definition = Cura.MachineManager.activeDefinitionId
+                                    if(Cura.MachineManager.hasVariants)
+                                    {
+                                        result.variant = Cura.MachineManager.activeVariantId
+                                    }
+                                }
+                                else
+                                {
+                                    result.definition = "fdmprinter"
+                                }
+                                return result
+                            }
                         }
                         MenuItem
                         {