diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 3e5527c75c..bf67efdba3 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -366,7 +366,7 @@ UM.MainWindow
                 onStopMonitoringPrint: base.showPrintMonitor = false
             }
 
-            Rectangle
+            Sidebar
             {
                 id: sidebar
 
@@ -378,24 +378,8 @@ UM.MainWindow
                 }
 
                 width: UM.Theme.getSize("sidebar").width
-
-                // This is the default sidebar view.
-                // It is hidden when the active sidebar view ID is not default.
-                Sidebar
-                {
-                    id: defaultSidebar
-
-                    anchors {
-                        top: parent.top
-                        bottom: parent.bottom
-                        left: parent.left
-                        right: parent.right
-                    }
-
-                    width: parent.width
-                    z: 1
-                    monitoringPrint: base.showPrintMonitor
-                }
+                z: 1
+                monitoringPrint: base.showPrintMonitor
             }
 
             Rectangle
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 9d0957806d..4a8a0c6a32 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -87,15 +87,6 @@ Rectangle
         }
     }
 
-    onCurrentModeIndexChanged:
-    {
-        UM.Preferences.setValue("cura/active_mode", currentModeIndex);
-        if(modesListModel.count > base.currentModeIndex)
-        {
-            sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "replace": true });
-        }
-    }
-
     SidebarHeader {
         id: header
         width: parent.width
@@ -114,6 +105,15 @@ Rectangle
         anchors.topMargin: visible ? UM.Theme.getSize("sidebar_margin").height : 0
     }
 
+    onCurrentModeIndexChanged:
+    {
+        UM.Preferences.setValue("cura/active_mode", currentModeIndex);
+        if(modesListModel.count > base.currentModeIndex)
+        {
+            sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "replace": true });
+        }
+    }
+
     Label {
         id: settingsModeLabel
         text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");