1 files changed, 6 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
index 0f31d6223027..79284abf8356 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -56,6 +56,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
   protected JComponent myAnchor;
 
   private Module myModuleContext = null;
+  private boolean myHasModuleMacro = false;
 
   public CommonProgramParametersPanel() {
     this(true);
@@ -120,7 +121,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
       @Override
       public void actionPerformed(ActionEvent e) {
         List<String> macros = new SmartList<String>(PathMacros.getInstance().getUserMacroNames());
-        if (myModuleContext != null) {
+        if (myModuleContext != null || myHasModuleMacro) {
           macros.add(PathMacroUtil.MODULE_DIR_MACRO_NAME);
         }
 
@@ -172,6 +173,10 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
     myModuleContext = moduleContext;
   }
 
+  public void setHasModuleMacro() {
+    myHasModuleMacro = true;
+  }
+
   public LabeledComponent<RawCommandLineEditor> getProgramParametersComponent() {
     return myProgramParametersComponent;
   }