diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 3b89ae8048..c5f2fc3fa6 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -1,7 +1,7 @@
 
 from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
 from UM.Application import Application
-from UM.Signal import Signal, signalemitter
+from UM.Settings.ContainerRegistry import ContainerRegistry
 
 class MachineManagerModel(QObject):
     def __init__(self, parent = None):
@@ -15,11 +15,19 @@ class MachineManagerModel(QObject):
 
     @pyqtSlot(str)
     def setActiveMachine(self, stack_id):
-        pass
+        containers = ContainerRegistry.getInstance().findContainerStacks(id = stack_id)
+        if containers:
+            Application.getInstance().setGlobalContainerStack(containers[0])
+
+    @pyqtProperty(str, notify = globalContainerChanged)
+    def activeMachineName(self):
+        return Application.getInstance().getGlobalContainerStack().getName()
 
     @pyqtProperty(str, notify = globalContainerChanged)
     def activeMachineId(self):
         return Application.getInstance().getGlobalContainerStack().getId()
 
+
+
 def createMachineManagerModel(engine, script_engine):
     return MachineManagerModel()
\ No newline at end of file
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index b66aea084a..83188007cf 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -58,10 +58,10 @@ Item
 
         ToolButton {
             id: machineSelection
-            text: UM.MachineManager.activeMachineInstance;
+            text: Cura.MachineManager.activeMachineName;
             width: parent.width/100*55
             height: UM.Theme.getSize("setting_control").height
-            tooltip: UM.MachineManager.activeMachineInstance;
+            tooltip: Cura.MachineManager.activeMachineName;
             anchors.right: parent.right
             anchors.rightMargin: UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter