diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
index e549715f5f7e..2dc1d7a3153e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
@@ -1066,7 +1066,7 @@ public class JavaKeywordCompletion {
           }
         }
       }
-      if (!psiClass.isInterface()) {
+      if (!psiClass.isInterface() && !(psiClass instanceof PsiTypeParameter)) {
         addKeyword(new OverridableSpace(createKeyword(PsiKeyword.IMPLEMENTS), TailTypes.humbleSpaceBeforeWordType()));
       }
     }
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends11.java b/java/java-tests/testData/codeInsight/completion/keywords/extends11.java
index a7cd5d64107c..ad2c24461c6b 100644
--- a/java/java-tests/testData/codeInsight/completion/keywords/extends11.java
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends11.java
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 class A{
- void <T extends String, V e<caret>>foo(){}
+ void <T extends String, V <caret>>foo(){}
 }
\ No newline at end of file