diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 3a8af2e9f9..1bc55d76f9 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -1106,7 +1106,6 @@ class CuraApplication(QtApplication):
             self._camera_animation.setTarget(Selection.getSelectedObject(0).getWorldPosition())
             self._camera_animation.start()
 
-    requestAddPrinter = pyqtSignal()
     activityChanged = pyqtSignal()
     sceneBoundingBoxChanged = pyqtSignal()
 
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 55bede1866..267ead1138 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -788,12 +788,6 @@ UM.MainWindow
         onTriggered: addMachineDialog.show()
     }
 
-    Connections
-    {
-        target: CuraApplication
-        onRequestAddPrinter: addMachineDialog.show()
-    }
-
     AboutDialog
     {
         id: aboutDialog
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 9bb17470c8..cbbb0b80bf 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -45,7 +45,7 @@ UM.ManagementPage
         {
             text: catalog.i18nc("@action:button", "Add");
             iconName: "list-add";
-            onClicked: CuraApplication.requestAddPrinter()
+            onClicked: Cura.Actions.addMachine.trigger()
         },
         Button
         {
diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml
index 4f664165c3..4a0867c9a2 100644
--- a/resources/qml/WelcomePages/WizardDialog.qml
+++ b/resources/qml/WelcomePages/WizardDialog.qml
@@ -20,6 +20,7 @@ Window
     id: dialog
 
     flags: Qt.Dialog
+    modality: Qt.ApplicationModal
 
     minimumWidth: 580 * screenScaleFactor
     minimumHeight: 600 * screenScaleFactor