diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index c0127c115b5cbd4d90b637c84e45adb0585e6a6c..463f87f9217de08aa925d5632c131b5e5a3403cf 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -376,6 +376,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f
       m_ignoreChange(false),
       m_showImport(importEnabled),
       m_buildConfigurationTemplateUnchanged(true),
+      m_shadowBuildCheckBoxVisible(false),
       m_selected(0),
       m_qtVersionId(-1)
 {
@@ -568,6 +569,7 @@ void Qt4DefaultTargetSetupWidget::setProFilePath(const QString &proFilePath)
 
 void Qt4DefaultTargetSetupWidget::setShadowBuildCheckBoxVisible(bool b)
 {
+    m_shadowBuildCheckBoxVisible = b;
     m_shadowBuildEnabled->setVisible(b);
     bool anythingVisible = b || m_buildConfigurationComboBox->isVisible();
     m_spacerTopWidget->setVisible(anythingVisible && !m_importInfos.isEmpty());
@@ -938,7 +940,7 @@ void Qt4DefaultTargetSetupWidget::updateWidgetVisibility()
         m_versionComboBox->setVisible(true);
         qtVersionChanged();
     }
-    m_shadowBuildEnabled->setVisible(state != NONE);
+    m_shadowBuildEnabled->setVisible(m_shadowBuildCheckBoxVisible && (state != NONE));
     emit selectedToggled();
 }
 
diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h
index 949cf4ad4481fec5bcb117fc8ca95dfd4be51518..869864b746107f5cb56906f2afd58a9ed7b0364f 100644
--- a/src/plugins/qt4projectmanager/qt4target.h
+++ b/src/plugins/qt4projectmanager/qt4target.h
@@ -190,6 +190,7 @@ private:
     bool m_ignoreChange;
     bool m_showImport;
     bool m_buildConfigurationTemplateUnchanged;
+    bool m_shadowBuildCheckBoxVisible;
     int m_selected; // Number of selected buildconfiguartions
     int m_qtVersionId; // version id for "One Qt" entry
 };