diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index aedf5d0fa8..5530468c4c 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -24,7 +24,7 @@ UM.MainWindow
     // It should be phased out in newer plugin versions.
     Connections
     {
-        target: Printer
+        target: CuraApplication
         onShowPrintMonitor: {
             if (show) {
                 UM.Controller.setActiveStage("MonitorStage")
@@ -377,7 +377,6 @@ UM.MainWindow
                 }
 
                 width: UM.Theme.getSize("sidebar").width
-                z: 1
 
                 source: UM.Controller.activeStage.sidebarComponent
             }
@@ -819,7 +818,7 @@ UM.MainWindow
 
     Connections
     {
-        target: Printer
+        target: CuraApplication
         onShowMessageBox:
         {
             messageDialog.title = title
@@ -865,7 +864,7 @@ UM.MainWindow
 
     Connections
     {
-        target: Printer
+        target: CuraApplication
         onRequestAddPrinter:
         {
             addMachineDialog.visible = true
diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index 6454e32117..9305e2261a 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -198,14 +198,19 @@ Item
             spacing: UM.Theme.getSize("default_margin").width
         }
 
+        Component.onCompleted: {
+            updateAdditionalComponents("monitorButtons")
+        }
+
         Connections {
-            target: Printer
-            onAdditionalComponentsChanged:
-            {
-                if(areaId == "monitorButtons") {
-                    for (var component in CuraApplication.additionalComponents["monitorButtons"]) {
-                        CuraApplication.additionalComponents["monitorButtons"][component].parent = additionalComponentsRow
-                    }
+            target: CuraApplication
+            onAdditionalComponentsChanged: updateAdditionalComponents
+        }
+
+        function updateAdditionalComponents (areaId) {
+            if(areaId == "monitorButtons") {
+                for (var component in CuraApplication.additionalComponents["monitorButtons"]) {
+                    CuraApplication.additionalComponents["monitorButtons"][component].parent = additionalComponentsRow
                 }
             }
         }
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index dc978c0f7a..a8e25155e1 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -222,14 +222,19 @@ UM.ManagementPage
             }
         }
 
+        Component.onCompleted: {
+            addAdditionalComponents("machinesDetailPane")
+        }
+
         Connections {
-            target: Printer
-            onAdditionalComponentsChanged:
-            {
-                if(areaId == "machinesDetailPane") {
-                    for (var component in CuraApplication.additionalComponents["machinesDetailPane"]) {
-                        CuraApplication.additionalComponents["machinesDetailPane"][component].parent = additionalComponentsColumn
-                    }
+            target: CuraApplication
+            onAdditionalComponentsChanged: addAdditionalComponents
+        }
+
+        function addAdditionalComponents (areaId) {
+            if(areaId == "machinesDetailPane") {
+                for (var component in CuraApplication.additionalComponents["machinesDetailPane"]) {
+                    CuraApplication.additionalComponents["machinesDetailPane"][component].parent = additionalComponentsColumn
                 }
             }
         }
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index 25bc10d122..c83e344876 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -135,14 +135,19 @@ Item {
             spacing: UM.Theme.getSize("default_margin").width
         }
 
+        Component.onCompleted: {
+            addAdditionalComponents("saveButton")
+        }
+
         Connections {
-            target: Printer
-            onAdditionalComponentsChanged:
-            {
-                if(areaId == "saveButton") {
-                    for (var component in CuraApplication.additionalComponents["saveButton"]) {
-                        CuraApplication.additionalComponents["saveButton"][component].parent = additionalComponentsRow
-                    }
+            target: CuraApplication
+            onAdditionalComponentsChanged: addAdditionalComponents
+        }
+
+        function addAdditionalComponents (areaId) {
+            if(areaId == "saveButton") {
+                for (var component in CuraApplication.additionalComponents["saveButton"]) {
+                    CuraApplication.additionalComponents["saveButton"][component].parent = additionalComponentsRow
                 }
             }
         }
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index a459b481db..ea66aca50f 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -549,7 +549,6 @@ Rectangle
         visible: monitoringPrint
     }
 
-
     SidebarTooltip
     {
         id: tooltip;