diff --git a/platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java b/platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
index 1d14bdb6631c..a6ff1be33e18 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
@@ -26,7 +26,11 @@ import java.util.Map;
 public class ExpandMacroToPathMap extends PathMacroMap {
 
   public void addMacroExpand(String macroName, String path) {
-    put("$" + macroName + "$", quotePath(path));
+    String replacement = quotePath(path);
+    String withSlash = StringUtil.trimEnd(replacement, "/") + "/";
+    put("$" + macroName + "$//", withSlash);
+    put("$" + macroName + "$/", withSlash);
+    put("$" + macroName + "$", replacement);
   }
 
   public String substitute(String text, boolean caseSensitive) {