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/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
         }
     }
 }