diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index dc664fe9ff..93e663697c 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -400,7 +400,7 @@ class CuraApplication(QtApplication):
     def getSettingValue(self, key):
         if not self.getMachineManager().getActiveProfile():
             return None
-        return self.getMachineManager().getActiveProfile().getSettingValueByKey(key)
+        return self.getMachineManager().getActiveProfile().getSettingValue(key)
         #return self.getActiveMachine().getSettingValueByKey(key)
     
     ##  Change setting by key value pair
@@ -409,7 +409,7 @@ class CuraApplication(QtApplication):
         if not self.getMachineManager().getActiveProfile():
             return
 
-        self.getMachineManager().getActiveProfile().getSettingValueByKey(key, value)
+        self.getMachineManager().getActiveProfile().setSettingValue(key, value)
         
     @pyqtSlot()
     def mergeSelected(self):
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 76b59489ad..77dcde94e7 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -133,7 +133,7 @@ Rectangle
                         if(model.getItem(i).name == UM.MachineManager.activeProfile)
                             return i;
                     }
-
+                    UM.MachineManager.setActiveProfile(model.getItem(0).name)
                     return 0;
                 }
             }