diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index 949aa89ccce7..90355bf0656d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -250,6 +250,7 @@ public class JavaCompletionContributor extends CompletionContributor {
     PsiElement parent = position.getParent();
 
     if (new JavaKeywordCompletion(parameters, session).addWildcardExtendsSuper(result, position)) {
+      result.stopHere();
       return;
     }
 
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/afterWildcard.java b/java/java-tests/testData/codeInsight/completion/keywords/afterWildcard.java
new file mode 100644
index 000000000000..5bac7b501812
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/afterWildcard.java
@@ -0,0 +1,4 @@
+class MyClass {
+
+  private static final Map<Class<?>, String> schemes = new HashMap<Class<?<caret>>, String>();
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
index 22bb23a36fa7..d2fafaa430d4 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
@@ -186,6 +186,11 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
     testByCount(1, "package");
   }
 
+  public void testAfterWildcard() {
+    configureByTestName();
+    assertStringItems("extends", "super");
+  }
+
   private void doTest() {
     configureByTestName();
     checkResultByTestName();