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 4fabfe3140bb..79284abf8356 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -121,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);
         }