diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/MemberLookupHelper.java b/java/java-impl/src/com/intellij/codeInsight/completion/MemberLookupHelper.java
index 3338dbc086c8..812fa657537a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/MemberLookupHelper.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/MemberLookupHelper.java
@@ -62,7 +62,7 @@ public class MemberLookupHelper {
     final String params = myMergedOverloads
                           ? "(...)"
                           : myMember instanceof PsiMethod
-                            ? PsiFormatUtil.formatMethod((PsiMethod)myMember, PsiSubstitutor.EMPTY,
+                            ? PsiFormatUtil.formatMethod((PsiMethod)myMember, substitutor,
                                                          PsiFormatUtil.SHOW_PARAMETERS,
                                                          PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE)
                             : "";
diff --git a/java/java-tests/testData/codeInsight/completion/normal/MethodItemPresentationGenerics.java b/java/java-tests/testData/codeInsight/completion/normal/MethodItemPresentationGenerics.java
new file mode 100644
index 000000000000..01242a517150
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/MethodItemPresentationGenerics.java
@@ -0,0 +1,8 @@
+import java.util.ArrayList;
+
+class TestPoint2D {
+    {
+        new ArrayList<String>().ad<caret>
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index ce081a4ffe3d..d98a7e91e72c 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -129,6 +129,18 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     assert presentation.itemTextBold
   }
 
+  public void testMethodItemPresentationGenerics() {
+    configure()
+    def presentation = new LookupElementPresentation()
+    myItems[0].renderElement(presentation)
+    assert "add" == presentation.itemText
+    assert "(String o)" == presentation.tailText
+    assert "boolean" == presentation.typeText
+
+    assert !presentation.tailGrayed
+    assert presentation.itemTextBold
+  }
+
   public void testPreferLongerNamesOption() throws Exception {
     configureByFile("PreferLongerNamesOption.java");