diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 8b4407745e..a1d9bcfafd 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -148,7 +148,15 @@ Cura.MachineAction
                         ComboBox
                         {
                             model: ["RepRap (Marlin/Sprinter)", "UltiGCode", "Repetier"]
-                            currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1
+                            currentIndex:
+                            {
+                                var index = model.indexOf(machineGCodeFlavorProvider.properties.value);
+                                if(index == -1)
+                                {
+                                    index = 0;
+                                }
+                                return index
+                            }
                             onActivated:
                             {
                                 machineGCodeFlavorProvider.setPropertyValue("value", model[index]);
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 5ac22e453c..6556f7e56a 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -402,7 +402,18 @@ UM.MainWindow
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
                 visible: base.monitoringPrint
-                source: Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage ? Cura.MachineManager.printerOutputDevices[0].cameraImage : ""
+                source:
+                {
+                    if(!base.monitoringPrint)
+                    {
+                        return "";
+                    }
+                    if(Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage)
+                    {
+                        return Cura.MachineManager.printerOutputDevices[0].cameraImage;
+                    }
+                    return "";
+                }
             }
 
             UM.MessageStack