diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 7ca89eb1767dfceb87205bffc69f379c8cf4b799..9914b97d4928768c61e4545a81bdc6fbb8f1d022 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -762,6 +762,7 @@ bool LinkManager::endConfigurationEditing(LinkConfiguration* config, LinkConfigu
         saveLinkConfigurationList();
         // Tell link about changes (if any)
         config->updateSettings();
+        emit config->nameChanged(config->name());
         // Discard temporary duplicate
         delete editedConfig;
     } else {
diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml
index f02c9e4e15be7b75aca44658278ec0da3bd432de..9db7d6ac64c841cb378952d7b5b7e458050875de 100644
--- a/src/ui/preferences/LinkSettings.qml
+++ b/src/ui/preferences/LinkSettings.qml
@@ -67,7 +67,6 @@ Rectangle {
                     text:                       object.name
                     exclusiveGroup:             linkGroup
                     visible:                    !object.dynamic
-
                     onClicked: {
                         checked = true
                         _currentSelection = object
@@ -275,7 +274,7 @@ Rectangle {
                                             linkSettingLoader.source = ""
                                             linkSettingLoader.visible = false
                                             // Save current name
-                                            var name = editConfig.name
+                                            var name = nameField.text
                                             // Discard link configuration (old type)
                                             QGroundControl.linkManager.cancelConfigurationEditing(editConfig)
                                             // Create new link configuration