diff --git a/cura/PrintersModel.py b/cura/PrintersModel.py
index 26b65409c5..0c58d9bf8c 100644
--- a/cura/PrintersModel.py
+++ b/cura/PrintersModel.py
@@ -56,10 +56,14 @@ class PrintersModel(ListModel):
             connection_type = container_stack.getMetaDataEntry("connection_type")
             has_remote_connection = connection_type in [str(ConnectionType.NetworkConnection), str(ConnectionType.CloudConnection)]
 
+            if container_stack.getMetaDataEntry("hidden", False) in ["True", True]:
+                continue
+
             # TODO: Remove reference to connect group name.
             items.append({"name": container_stack.getMetaDataEntry("connect_group_name", container_stack.getName()),
                           "id": container_stack.getId(),
                           "hasRemoteConnection": has_remote_connection,
-                          "connectionType": connection_type})
+                          "connectionType": connection_type,
+                          "metadata": container_stack.getMetaData().copy()})
         items.sort(key=lambda i: not i["hasRemoteConnection"])
         self.setItems(items)
\ No newline at end of file
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index db43207cc9..c51c26f1b9 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1321,17 +1321,18 @@ class MachineManager(QObject):
         # Get the definition id corresponding to this machine name
         machine_definition_id = CuraContainerRegistry.getInstance().findDefinitionContainers(name = machine_name)[0].getId()
         # Try to find a machine with the same network key
-        new_machine = self.getMachine(machine_definition_id, metadata_filter = {"um_network_key": self.activeMachineNetworkKey})
+        new_machine = self.getMachine(machine_definition_id, metadata_filter = {"um_network_key": self.activeMachineNetworkKey()})
         # If there is no machine, then create a new one and set it to the non-hidden instance
         if not new_machine:
             new_machine = CuraStackBuilder.createMachine(machine_definition_id + "_sync", machine_definition_id)
             if not new_machine:
                 return
-            new_machine.setMetaDataEntry("um_network_key", self.activeMachineNetworkKey)
+            new_machine.setMetaDataEntry("um_network_key", self.activeMachineNetworkKey())
             new_machine.setMetaDataEntry("connect_group_name", self.activeMachineNetworkGroupName)
             new_machine.setMetaDataEntry("hidden", False)
+            new_machine.setMetaDataEntry("connection_type", self._global_container_stack.getMetaDataEntry("connection_type"))
         else:
-            Logger.log("i", "Found a %s with the key %s. Let's use it!", machine_name, self.activeMachineNetworkKey)
+            Logger.log("i", "Found a %s with the key %s. Let's use it!", machine_name, self.activeMachineNetworkKey())
             new_machine.setMetaDataEntry("hidden", False)
 
         # Set the current printer instance to hidden (the metadata entry must exist)
@@ -1391,10 +1392,10 @@ class MachineManager(QObject):
     #   After updating from 3.2 to 3.3 some group names may be temporary. If there is a mismatch in the name of the group
     #   then all the container stacks are updated, both the current and the hidden ones.
     def checkCorrectGroupName(self, device_id: str, group_name: str) -> None:
-        if self._global_container_stack and device_id == self.activeMachineNetworkKey:
+        if self._global_container_stack and device_id == self.activeMachineNetworkKey():
             # Check if the connect_group_name is correct. If not, update all the containers connected to the same printer
             if self.activeMachineNetworkGroupName != group_name:
-                metadata_filter = {"um_network_key": self.activeMachineNetworkKey}
+                metadata_filter = {"um_network_key": self.activeMachineNetworkKey()}
                 containers = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter)
                 for container in containers:
                     container.setMetaDataEntry("connect_group_name", group_name)
diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml
index e0dc6f5e44..52cea0ea80 100644
--- a/resources/qml/PrinterSelector/MachineSelectorList.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorList.qml
@@ -31,32 +31,16 @@ ListView
         text: model.name
         width: listView.width
         outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
-    }
-}
-    /*
 
-
-
-    Repeater
-    {
-        id: networkedPrinters
-
-        model: Cura.PrintersModel
+        checked:
         {
-            id: networkedPrintersModel
-        }
-
-        delegate: MachineSelectorButton
-        {
-            text: model.name //model.metadata["connect_group_name"]
-            //checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
-            outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
-
-            Connections
+            // If the machine has a remote connection
+            var result = Cura.MachineManager.activeMachineId == model.id
+            if (Cura.MachineManager.activeMachineHasRemoteConnection)
             {
-                target: Cura.MachineManager
-                onActiveMachineNetworkGroupNameChanged: checked = Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
+                result |= Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
             }
+            return result
         }
-    }*/
-
+    }
+}
\ No newline at end of file