diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index 720ed47f3ff..5e007c00545 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -192,6 +192,9 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
             this, SLOT(updateBuildActions()));
 
+    connect(SessionManager::instance(), SIGNAL(projectAdded(ProjectExplorer::Project*)),
+            this, SLOT(projectWasAdded(ProjectExplorer::Project*)));
+
     // Run initial setup routines
     updateContextActions(0, 0);
     updateReparseQbsAction();
@@ -203,15 +206,22 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
 void QbsProjectManagerPlugin::extensionsInitialized()
 { }
 
+void QbsProjectManagerPlugin::projectWasAdded(Project *project)
+{
+    QbsProject *qbsProject = qobject_cast<QbsProject *>(project);
+
+    if (!qbsProject)
+        return;
+
+    connect(qbsProject, SIGNAL(projectParsingStarted()), this, SLOT(parsingStateChanged()));
+    connect(qbsProject, SIGNAL(projectParsingDone(bool)), this, SLOT(parsingStateChanged()));
+}
+
 void QbsProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node, ProjectExplorer::Project *project)
 {
     if (m_selectedProject) {
         disconnect(m_selectedProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
                    this, SLOT(activeTargetChanged()));
-        disconnect(m_selectedProject, SIGNAL(projectParsingStarted()),
-                   this, SLOT(parsingStateChanged()));
-        disconnect(m_selectedProject, SIGNAL(projectParsingDone(bool)),
-                   this, SLOT(parsingStateChanged()));
     }
 
     m_selectedNode = node;
@@ -219,10 +229,6 @@ void QbsProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node,
     if (m_selectedProject) {
         connect(m_selectedProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
                 this, SLOT(activeTargetChanged()));
-        connect(m_selectedProject, SIGNAL(projectParsingStarted()),
-                this, SLOT(parsingStateChanged()));
-        connect(m_selectedProject, SIGNAL(projectParsingDone(bool)),
-                this, SLOT(parsingStateChanged()));
     }
 
     activeTargetChanged();
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
index 50d52b8e69d..d3e41a07da4 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
@@ -66,12 +66,14 @@ public:
     void extensionsInitialized();
 
 private slots:
+    void projectWasAdded(ProjectExplorer::Project *project);
     void updateContextActions(ProjectExplorer::Node *node, ProjectExplorer::Project *project);
     void updateReparseQbsAction();
     void updateBuildActions();
     void activeTargetChanged();
     void buildStateChanged(ProjectExplorer::Project *project);
     void parsingStateChanged();
+
     void buildFileContextMenu();
     void buildFile();
     void buildProductContextMenu();