diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index d53f0eaa4ab..e4d5fcac925 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -251,6 +251,16 @@ RunSettingsWidget::RunSettingsWidget(Target *target)
     connect(m_renameRunButton, SIGNAL(clicked()),
             this, SLOT(renameRunConfiguration()));
 
+    connect(m_target, SIGNAL(addedRunConfiguration(ProjectExplorer::RunConfiguration*)),
+            this, SLOT(updateRemoveToolButton()));
+    connect(m_target, SIGNAL(removedRunConfiguration(ProjectExplorer::RunConfiguration*)),
+            this, SLOT(updateRemoveToolButton()));
+
+    connect(m_target, SIGNAL(addedDeployConfiguration(ProjectExplorer::DeployConfiguration*)),
+            this, SLOT(updateRemoveToolButton()));
+    connect(m_target, SIGNAL(removedDeployConfiguration(ProjectExplorer::DeployConfiguration*)),
+            this, SLOT(updateRemoveToolButton()));
+
     connect(m_target, SIGNAL(activeRunConfigurationChanged(ProjectExplorer::RunConfiguration*)),
             this, SLOT(activeRunConfigurationChanged()));
 }
@@ -457,6 +467,12 @@ void RunSettingsWidget::renameDeployConfiguration()
     m_target->activeDeployConfiguration()->setDisplayName(name);
 }
 
+void RunSettingsWidget::updateRemoveToolButton()
+{
+    m_removeDeployToolButton->setEnabled(m_target->deployConfigurations().count() > 1);
+    m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1);
+}
+
 void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc)
 {
     delete m_deployConfigurationWidget;
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index 52f371bbfcf..ef5468f0fd8 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -91,6 +91,8 @@ private slots:
     void activeDeployConfigurationChanged();
     void renameDeployConfiguration();
 
+    void updateRemoveToolButton();
+
 private:
     QString uniqueDCName(const QString &name);
     QString uniqueRCName(const QString &name);