diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index a9e7024dfd7..838dc5a0fd0 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -1026,7 +1026,7 @@ void QtOptionsPageWidget::updateWidgets()
     const bool enabled = version != 0;
     const bool isAutodetected = enabled && version->isAutodetected();
     m_ui->delButton->setEnabled(enabled && !isAutodetected);
-    m_versionUi->nameEdit->setEnabled(enabled && !isAutodetected);
+    m_versionUi->nameEdit->setEnabled(enabled);
     m_versionUi->editPathPushButton->setEnabled(enabled && !isAutodetected);
 }
 
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 0b8f0adb1db..615a3d0ed5f 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -294,6 +294,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
                     qDebug() << " Qt version found with same autodetection source" << autoDetectionSource << " => Migrating id:" << id;
                 m_versions.remove(id);
                 qtversionMap[QLatin1String(Constants::QTVERSIONID)] = id;
+                qtversionMap[QLatin1String(Constants::QTVERSIONNAME)] = v->displayName();
                 delete v;
 
                 if (BaseQtVersion *qtv = factory->restore(type, qtversionMap)) {