diff --git a/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java b/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java
index b3bdd2578f81..3ccf417846f2 100644
--- a/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java
+++ b/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.intellij.lang.customFolding;
 
 import com.intellij.lang.folding.CustomFoldingProvider;
+import com.intellij.openapi.util.text.StringUtil;
 
 /**
  * Supports <a href="http://msdn.microsoft.com/en-us/library/9a1ybwek%28v=vs.100%29.aspx">VisualStudio custom foldings.</a>
@@ -34,7 +35,8 @@ public class VisualStudioCustomFoldingProvider extends CustomFoldingProvider {
 
   @Override
   public String getPlaceholderText(String elementText) {
-    return elementText.replaceFirst("[/*#-]*\\s*region(.*)","$1").trim();
+    String result = elementText.replaceFirst("[/*#-]*\\s*region(.*)", "$1");
+    return elementText.startsWith("/*") ? StringUtil.trimEnd(result, "*/").trim() : result;
   }
 
   @Override