diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index e623ad05d9bd85abe35a83816bef73cec915b160..36cb7a3aa61eef05e45aa5ebcdc0c3209799712c 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -551,6 +551,7 @@ void EnvironmentWidget::environmentCurrentIndexChanged(const QModelIndex &curren
 {
     Q_UNUSED(previous)
     if (current.isValid()) {
+        m_editButton->setEnabled(true);
         if (m_model->mergedEnvironments()) {
             const QString &name = m_model->indexToVariable(current);
             bool modified = m_model->isInBaseEnvironment(name) && m_model->changes(name);
@@ -562,7 +563,7 @@ void EnvironmentWidget::environmentCurrentIndexChanged(const QModelIndex &curren
             m_unsetButton->setEnabled(!m_model->isUnset(m_model->indexToVariable(current)));
         }
     } else {
-        m_editButton->setEnabled(current.isValid());
+        m_editButton->setEnabled(false);
         m_removeButton->setEnabled(false);
         m_unsetButton->setEnabled(false);
     }