diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 8b50530ceb6a7f38e553c59f7011a727261079aa..004e3720fdaa2d419e960a454b58726ba5939d1f 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -229,6 +229,8 @@ void Qt4ProjectConfigWidget::qtVersionsChanged()
 
 void Qt4ProjectConfigWidget::buildDirectoryChanged()
 {
+    if (m_ignoreChange)
+        return;
     m_ui->shadowBuildDirEdit->setPath(m_buildConfiguration->shadowBuildDirectory());
     updateDetails();
     updateImportLabel();
@@ -248,7 +250,7 @@ void Qt4ProjectConfigWidget::shadowBuildClicked(bool checked)
     bool b = m_ui->shadowBuildCheckBox->isChecked();
 
     m_ignoreChange = true;
-    m_buildConfiguration->setShadowBuildAndDirectory(b, b ? m_ui->shadowBuildDirEdit->path() : QString::null);
+    m_buildConfiguration->setShadowBuildAndDirectory(b, m_ui->shadowBuildDirEdit->path());
     m_ignoreChange = false;
 
     updateDetails();