diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 1fe0131e538..b39bc561272 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2073,11 +2073,15 @@ void ProjectExplorerPlugin::activeRunConfigurationChanged()
     if (previousRunConfiguration) {
         disconnect(previousRunConfiguration, SIGNAL(isEnabledChanged(bool)),
                    this, SIGNAL(updateRunActions()));
+        disconnect(previousRunConfiguration, SIGNAL(debuggersChanged()),
+                   this, SIGNAL(updateRunActions()));
     }
     previousRunConfiguration = rc;
     if (rc) {
         connect(rc, SIGNAL(isEnabledChanged(bool)),
                 this, SIGNAL(updateRunActions()));
+        connect(rc, SIGNAL(debuggersChanged()),
+                this, SIGNAL(updateRunActions()));
     }
     emit updateRunActions();
 }
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index 08821eccdef..a3360b280a3 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
@@ -263,13 +263,11 @@ void QmlProjectRunConfigurationWidget::onViewerArgsChanged()
 void QmlProjectRunConfigurationWidget::useCppDebuggerToggled(bool toggled)
 {
     m_runConfiguration->setUseCppDebugger(toggled);
-    m_runConfiguration->updateEnabled();
 }
 
 void QmlProjectRunConfigurationWidget::useQmlDebuggerToggled(bool toggled)
 {
     m_runConfiguration->setUseQmlDebugger(toggled);
-    m_runConfiguration->updateEnabled();
 }
 
 void QmlProjectRunConfigurationWidget::qmlDebugServerPortChanged(uint port)
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index ebe1499b433..9caca715163 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -131,7 +131,6 @@ void RemoteLinuxRunConfiguration::init()
     Qt4Project *pro = qt4Target()->qt4Project();
     connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
             this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
-    connect(this, SIGNAL(debuggersChanged()), SLOT(updateEnabledState()));
     connect(target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
         SLOT(updateEnabledState()));
 }