diff --git a/cura/Machines/Models/FirstStartMachineActionsModel.py b/cura/Machines/Models/FirstStartMachineActionsModel.py
index 489509f4ec..aad5372cde 100644
--- a/cura/Machines/Models/FirstStartMachineActionsModel.py
+++ b/cura/Machines/Models/FirstStartMachineActionsModel.py
@@ -95,6 +95,7 @@ class FirstStartMachineActionsModel(ListModel):
                               "content": item.displayItem,
                               "action": item,
                               })
+            item.reset()
 
         self.setItems(item_list)
         self.reset()
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 6272157ec4..dd985fe5c3 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -84,7 +84,7 @@ UM.MainWindow
         Cura.Actions.parent = backgroundItem
         CuraApplication.purgeWindows()
 
-        if (CuraApplication.needToShowUserAgreement || Cura.MachineManager.activeMachine == null)
+        if (CuraApplication.needToShowUserAgreement)
         {
             welcomeDialog.visible = true
         }
@@ -851,6 +851,10 @@ UM.MainWindow
             {
                 base.visible = true;
             }
+            if(!CuraApplication.needToShowUserAgreement && Cura.MachineManager.activeMachine == null)
+            {
+                addMachineDialog.open();
+            }
         }
     }
 
diff --git a/resources/qml/Dialogs/AddMachineDialog.qml b/resources/qml/Dialogs/AddMachineDialog.qml
index dafe12693f..d3988155b7 100644
--- a/resources/qml/Dialogs/AddMachineDialog.qml
+++ b/resources/qml/Dialogs/AddMachineDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -38,7 +38,8 @@ UM.Dialog
     onVisibilityChanged:
     {
         // Reset selection and machine name
-        if (visible) {
+        if (visible)
+        {
             activeCategory = preferredCategory;
             machineList.currentIndex = 0;
             machineName.text = getMachineName();
diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
index 6fa50c69a1..ff64cdc33e 100644
--- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
@@ -147,6 +147,7 @@ ScrollView
             }
             text: name
             visible: base.currentSection == section
+            onClicked: ListView.view.currentIndex = index
         }
     }
 }