diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index cdbf1f3511..0312a636a6 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -214,22 +214,6 @@ UM.MainWindow
                 }
             }
 
-            Loader
-            {
-                id: viewPanel
-
-                anchors.bottom: viewModeButton.top
-                anchors.topMargin: UM.Theme.getSize("default_margin").height
-                anchors.right: viewModeButton.right
-
-                property var buttonTarget: Qt.point(viewModeButton.x + Math.round(viewModeButton.width / 2), viewModeButton.y + Math.round(viewModeButton.height / 2))
-
-                height: childrenRect.height
-                width: childrenRect.width
-
-                source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
-            }
-
             Cura.ActionPanelWidget
             {
                 anchors.right: parent.right
diff --git a/resources/qml/MachineSelector.qml b/resources/qml/MachineSelector.qml
index 793f45ddcf..a464949192 100644
--- a/resources/qml/MachineSelector.qml
+++ b/resources/qml/MachineSelector.qml
@@ -45,7 +45,7 @@ Cura.ExpandableComponent
         {
             anchors.fill: parent
             contentHeight: column.implicitHeight
-            contentWidth: row.implicitWidth
+            contentWidth: column.implicitWidth
             clip: true
             ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
 
diff --git a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
index c157b0b24f..33610135fe 100644
--- a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
+++ b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
@@ -111,7 +111,7 @@ Cura.ExpandableComponent
 
                 delegate: TabButton
                 {
-                    width: Math.round(ListView.view.width / extrudersModel.rowCount())
+                    width: ListView.view != null ?  Math.round(ListView.view.width / extrudersModel.rowCount()): 0
                     height: parent.height
                     contentItem: Item
                     {
@@ -156,7 +156,7 @@ Cura.ExpandableComponent
 
                     OldControls.CheckBox
                     {
-                        checked: Cura.MachineManager.getExtruder(tabControl.model.index).isEnabled
+                        checked: tabControl.model != null ? Cura.MachineManager.getExtruder(tabControl.model.index).isEnabled: false
                         onClicked: Cura.MachineManager.setExtruderEnabled(tabControl.model.index, checked)
                         height: UM.Theme.getSize("setting_control").height
                         style: UM.Theme.styles.checkbox
@@ -190,7 +190,7 @@ Cura.ExpandableComponent
                         tooltip: currentRootMaterialName
                         visible: Cura.MachineManager.hasMaterials
 
-                        enabled: !extrudersList.visible || Cura.ExtruderManager.activeExtruderIndex > -1
+                        enabled: Cura.ExtruderManager.activeExtruderIndex > -1
 
                         height: UM.Theme.getSize("setting_control").height
                         width: tabControl.controlWidth