diff --git a/platform/lang-impl/src/com/intellij/execution/ui/MacroComboBoxWithBrowseButton.java b/platform/lang-impl/src/com/intellij/execution/ui/MacroComboBoxWithBrowseButton.java
index d0e67a5910ec..50742ae4b8c9 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/MacroComboBoxWithBrowseButton.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/MacroComboBoxWithBrowseButton.java
@@ -91,7 +91,7 @@ public class MacroComboBoxWithBrowseButton extends ComponentWithBrowseButton<Com
 
   @Override
   public void setText(String text) {
-    accessor.setText(getChildComponent(), text);
+    accessor.setText(getChildComponent(), text != null ? text : "");
   }
 
   public void setModule(Module module) {