diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index ef2b19003c..790a522b26 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -818,7 +818,12 @@ UM.MainWindow
     Connections
     {
         target: Cura.Actions.addMachine
-        onTriggered: addMachineDialog.show()
+        onTriggered:
+        {
+            // Make sure to show from the first page when the dialog shows up.
+            addMachineDialog.resetModelState()
+            addMachineDialog.show()
+        }
     }
 
     AboutDialog
diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml
index 4a0867c9a2..dab39bec2e 100644
--- a/resources/qml/WelcomePages/WizardDialog.qml
+++ b/resources/qml/WelcomePages/WizardDialog.qml
@@ -30,12 +30,9 @@ Window
     property var model: null  // Needs to be set by whoever is using this dialog.
     property alias progressBarVisible: wizardPanel.progressBarVisible
 
-    onVisibilityChanged:
+    function resetModelState()
     {
-        if (visible)
-        {
-            model.resetState()
-        }
+        model.resetState()
     }
 
     WizardPanel