diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
index a76412579527..94abeec74040 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
@@ -54,7 +54,7 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
     String modifiedNamePattern = null;
 
     if (base.isSearchInAnyPlace() && !namePattern.trim().isEmpty()) {
-      modifiedNamePattern = "*" + namePattern + "*";
+      modifiedNamePattern = "*" + namePattern + (namePattern.endsWith(" ") ? "" : "*");
     }
 
     boolean empty = namePattern.isEmpty() || namePattern.equals("@");    // TODO[yole]: remove implicit dependency