diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 4314dc21e6..250dcf050e 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -193,13 +193,20 @@ UM.MainWindow
 
                 Instantiator
                 {
-//                     model: UM.MachineVariantsModel { }
+                    model: UM.InstanceContainersModel
+                    {
+                        filter:
+                        {
+                            "type": "variant",
+                            "definition": Cura.MachineManager.activeMachineDefinitionId //Only show variants of this machine
+                        }
+                    }
                     MenuItem {
                         text: model.name;
                         checkable: true;
                         checked: model.active;
                         exclusiveGroup: machineVariantsGroup;
-                        onTriggered: UM.MachineManager.setActiveMachineVariant(model.name)
+                        onTriggered: Cura.MachineManager.setActiveVariant(model.id)
                     }
                     onObjectAdded: machineMenu.insertItem(index, object)
                     onObjectRemoved: machineMenu.removeItem(object)
@@ -207,7 +214,7 @@ UM.MainWindow
 
                 ExclusiveGroup { id: machineVariantsGroup; }
 
-//                 MenuSeparator { visible: UM.MachineManager.hasVariants; }
+                MenuSeparator { visible: Cura.MachineManager.hasVariants; }
 
                 MenuItem { action: Actions.addMachine; }
                 MenuItem { action: Actions.configureMachines; }