diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 6c2a3c0f011b5900e9b3b77e7e51dc0b337b51f9..1e1e71d3fc3237836c10fe97a47fa646f79b86cd 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -129,6 +129,7 @@ void BuildStepsPage::init(const QString &buildConfiguration)
     }
 
     m_noStepsLabel->setVisible(steps.isEmpty());
+    m_removeButton->setEnabled(!steps.isEmpty());
 
     // make sure widget is updated
     foreach(BuildStepsWidgetStruct s, m_buildSteps) {
@@ -322,4 +323,6 @@ void BuildStepsPage::updateBuildStepButtonsState()
         s.upButton->setEnabled((i>0) && !(steps.at(i)->immutable() && steps.at(i - 1)));
         s.downButton->setEnabled((i + 1< steps.count()) && !(steps.at(i)->immutable() && steps.at(i + 1)->immutable()));
     }
+    m_noStepsLabel->setVisible(steps.isEmpty());
+    m_removeButton->setEnabled(!steps.isEmpty());
 }