diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index cd34a23955f..c5cf7a6dc50 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -115,6 +115,10 @@ bool NameValueItemsWidget::editVariable(const QString &name, Selection selection
             }
         };
         skipWhiteSpace();
+        if (offset < line.length() && line.at(offset) == '#') {
+            ++offset;
+            skipWhiteSpace();
+        }
         if (line.mid(offset, name.size()) != name)
             continue;
         offset += name.size();