diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index e4d5fcac925..c4a8e9b96e3 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -331,6 +331,7 @@ void RunSettingsWidget::activeRunConfigurationChanged()
     m_runConfigurationCombo->setCurrentIndex(actRc.row());
     setConfigurationWidget(m_runConfigurationsModel->runConfigurationAt(actRc.row()));
     m_ignoreChange = false;
+    m_renameRunButton->setEnabled(m_target->activeRunConfiguration());
 }
 
 void RunSettingsWidget::renameRunConfiguration()
@@ -482,6 +483,8 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc)
 
     m_deployConfigurationCombo->setCurrentIndex(-1);
 
+    m_renameDeployButton->setEnabled(dc);
+
     if (!dc)
         return;