diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 2cf2eeec9620eca1626f6866b7d133af257e89cf..8ac706e45021c8def5973ad9601f7e617e840b7a 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1259,7 +1259,7 @@ void ProjectExplorerPlugin::buildStateChanged(Project * pro)
 void ProjectExplorerPlugin::executeRunConfiguration(RunConfiguration *runConfiguration, const QString &runMode)
 {
     if (IRunControlFactory *runControlFactory = findRunControlFactory(runConfiguration, runMode)) {
-        emit aboutToExecuteProject(runConfiguration->target()->project());
+        emit aboutToExecuteProject(runConfiguration->target()->project(), runMode);
 
         RunControl *control = runControlFactory->create(runConfiguration, runMode);
         startRunControl(control, runMode);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 440314247419d0c29476d2cb5c03705f91ab98eb..bc4e7ff35128a8524ab0183dafe31fb511b227c0 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -146,7 +146,7 @@ signals:
 
     void currentProjectChanged(ProjectExplorer::Project *project);
     void currentNodeChanged(ProjectExplorer::Node *node, ProjectExplorer::Project *project);
-    void aboutToExecuteProject(ProjectExplorer::Project *project);
+    void aboutToExecuteProject(ProjectExplorer::Project *project, const QString &runMode);
 
     void settingsChanged();
 
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 3b25a5436c6fca50047d52167620f6797cc50411..0a27b96d25d724eaccac8c18a4a2b1921848dfe0 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -65,6 +65,7 @@
 
 using namespace Qml;
 
+
 static QToolButton *createToolButton(QAction *action)
 {
     QToolButton *button = new QToolButton;
@@ -95,6 +96,7 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
     Q_UNUSED(arguments);
     Q_UNUSED(errorString);
 
+    Core::ICore *core = Core::ICore::instance();
     connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
             SLOT(prepareDebugger(Core::IMode*)));
 
@@ -119,8 +121,8 @@ void QmlInspectorPlugin::extensionsInitialized()
 
     ProjectExplorer::ProjectExplorerPlugin *pex = ProjectExplorer::ProjectExplorerPlugin::instance();
     if (pex) {
-        connect(pex, SIGNAL(aboutToExecuteProject(ProjectExplorer::Project*)),
-                SLOT(activateDebuggerForProject(ProjectExplorer::Project*)));
+        connect(pex, SIGNAL(aboutToExecuteProject(ProjectExplorer::Project*, QString)),
+                SLOT(activateDebuggerForProject(ProjectExplorer::Project*, QString)));
     }
 
     QWidget *configBar = new QWidget;
@@ -147,11 +149,13 @@ void QmlInspectorPlugin::activateDebugger(const QString &langName)
     }
 }
 
-void QmlInspectorPlugin::activateDebuggerForProject(ProjectExplorer::Project *project)
+void QmlInspectorPlugin::activateDebuggerForProject(ProjectExplorer::Project *project, const QString &runMode)
 {
-    QmlProjectManager::QmlProject *qmlproj = qobject_cast<QmlProjectManager::QmlProject*>(project);
-    if (qmlproj)
-        m_connectionTimer->start();
+    if (runMode == ProjectExplorer::Constants::DEBUGMODE) {
+        QmlProjectManager::QmlProject *qmlproj = qobject_cast<QmlProjectManager::QmlProject*>(project);
+        if (qmlproj)
+            m_connectionTimer->start();
+    }
 
 }
 void QmlInspectorPlugin::pollInspector()
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.h b/src/plugins/qmlinspector/qmlinspectorplugin.h
index 738df9a21749cb319f047a7db81498d79ba9ff7c..9a592156f50ab948c9d5122e1bf0692531a76475 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.h
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.h
@@ -64,7 +64,7 @@ public:
 
 public slots:
     void activateDebugger(const QString &langName);
-    void activateDebuggerForProject(ProjectExplorer::Project *project);
+    void activateDebuggerForProject(ProjectExplorer::Project *project, const QString &runMode);
     void setDockWidgetArrangement(const QString &activeLanguage);
 
 private slots: