diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py
index 3bdbe7063d..0bacdc804b 100644
--- a/cura/Machines/Models/DiscoveredPrintersModel.py
+++ b/cura/Machines/Models/DiscoveredPrintersModel.py
@@ -22,6 +22,9 @@ class DiscoveredPrinter(QObject):
 
     nameChanged = pyqtSignal()
 
+    def getKey(self) -> str:
+        return self._key
+
     @pyqtProperty(str, notify = nameChanged)
     def name(self) -> str:
         return self._name
@@ -101,4 +104,4 @@ class DiscoveredPrinterModel(QObject):
 
     @pyqtSlot("QVariant")
     def createMachineFromDiscoveredPrinter(self, discovered_printer: "DiscoveredPrinter") -> None:
-        discovered_printer.create_callback()
+        discovered_printer.create_callback(discovered_printer.getKey())
diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml
index abd9eea9e9..285ab4b599 100644
--- a/resources/qml/PrinterSelector/MachineSelectorButton.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml
@@ -19,6 +19,8 @@ Button
     checkable: true
     hoverEnabled: true
 
+    property bool selected: checked
+
     property var outputDevice: null
     property var printerTypesList: []
 
@@ -79,7 +81,7 @@ Button
         color: machineSelectorButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent"
         radius: UM.Theme.getSize("action_button_radius").width
         border.width: UM.Theme.getSize("default_lining").width
-        border.color: machineSelectorButton.checked ? UM.Theme.getColor("primary") : "transparent"
+        border.color: machineSelectorButton.selected ? UM.Theme.getColor("primary") : "transparent"
     }
 
     Connections
diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index 9fe1571dd2..79e1cafe2e 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -57,7 +57,8 @@ Item
                 anchors.rightMargin: 10
                 outputDevice: modelData.device
 
-                checked: ListView.view.currentIndex == index
+                checkable: false
+                selected: ListView.view.currentIndex == model.index
                 onClicked:
                 {
                     ListView.view.currentIndex = index