diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index ca732427281e..6e485bfa8048 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -747,6 +747,10 @@ public abstract class ChooseByNameBase {
   }
 
   public String transformPattern(String pattern) {
+    final ChooseByNameModel model = getModel();
+    if (model instanceof ContributorsBasedGotoByModel) {
+      return ((ContributorsBasedGotoByModel)model).transformPattern(pattern);
+    }
     return pattern;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
index aa5302ca4b1c..9d1fe1b12b20 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
@@ -336,6 +336,11 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
 
   @Override
   public String transformPattern(String pattern) {
+    final ChooseByNameModel model = getModel();
+    return getTransformedPattern(pattern, model);
+  }
+
+  public static String getTransformedPattern(String pattern, ChooseByNameModel model) {
     Pattern regex = null;
     if (pattern.indexOf(':') != -1 ||
         pattern.indexOf(',') != -1 ||
@@ -345,7 +350,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
       regex = patternToDetectLinesAndColumns;
     }
 
-    if (getModel() instanceof GotoClassModel2) {
+    if (model instanceof GotoClassModel2) {
       if (pattern.indexOf('#') != -1) {
         regex = patternToDetectMembers;
       }
@@ -362,7 +367,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
       }
     }
 
-    return super.transformPattern(pattern);
+    return pattern;
   }
 
   public int getLinePosition() {