diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
index e4d75e8f6d..8ecbe016f1 100644
--- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
+++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
@@ -349,6 +349,11 @@ Cura.MachineAction
             addressField.focus = true;
         }
 
+        onAccepted:
+        {
+            manager.setManualDevice(printerKey, addressText)
+        }
+
         Column {
             anchors.fill: parent
             spacing: UM.Theme.getSize("default_margin").height
@@ -388,7 +393,7 @@ Cura.MachineAction
                 text: catalog.i18nc("@action:button", "OK")
                 onClicked:
                 {
-                    manager.setManualDevice(manualPrinterDialog.printerKey, manualPrinterDialog.addressText)
+                    manualPrinterDialog.accept()
                     manualPrinterDialog.hide()
                 }
                 enabled: manualPrinterDialog.addressText.trim() != ""
diff --git a/plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
index f4749a6747..3644bbf056 100644
--- a/plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
+++ b/plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
@@ -198,7 +198,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
             has_cluster_capable_firmware = Version(system_info["firmware"]) > self._min_cluster_version
             instance_name = "manual:%s" % address
             properties = {
-                b"name": (system_info["name"] + " (manual)").encode("utf-8"),
+                b"name": system_info["name"].encode("utf-8"),
                 b"address": address.encode("utf-8"),
                 b"firmware_version": system_info["firmware"].encode("utf-8"),
                 b"manual": b"true",