diff --git a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
index de3446ecb4bb..13ac82b52dcb 100644
--- a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
+++ b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
@@ -72,6 +72,9 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider {
       if (containingClass == null) return null;
       String classFqn = containingClass.getQualifiedName();
       if (classFqn == null) return member.getName();  // refer to member of anonymous class by simple name
+      if (member instanceof PsiMethod && containingClass.findMethodsByName(member.getName(), false).length > 1) {
+        return classFqn + "#" + member.getName() + getParameterString((PsiMethod)member);
+      }
       return classFqn + "#" + member.getName();
     }
     return null;
@@ -89,17 +92,18 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider {
     final int endIndex = fqn.indexOf('#');
     if (endIndex != -1) {
       String className = fqn.substring(0, endIndex);
-      if (className != null) {
-        aClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project));
-        if (aClass != null) {
-          String memberName = fqn.substring(endIndex + 1);
-          PsiField field = aClass.findFieldByName(memberName, false);
-          if (field != null) {
-            return field;
-          }
-          PsiMethod[] methods = aClass.findMethodsByName(memberName, false);
-          if (methods.length != 0) {
-            return methods[0];
+      int paramIndex = fqn.indexOf('(', endIndex);
+      aClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project));
+      if (aClass != null) {
+        String memberName = fqn.substring(endIndex + 1, paramIndex < 0 ? fqn.length() : paramIndex);
+        PsiField field = aClass.findFieldByName(memberName, false);
+        if (field != null) {
+          return field;
+        }
+        String paramString = paramIndex < 0 ? "" : fqn.substring(paramIndex);
+        for (PsiMethod overload : aClass.findMethodsByName(memberName, false)) {
+          if (StringUtil.isEmpty(paramString) || paramString.equals(getParameterString(overload))) {
+            return overload;
           }
         }
       }
@@ -161,14 +165,7 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider {
       if (toInsert.length() != 0) toInsert += "#";
       toInsert += member.getName();
       if (member instanceof PsiMethod) {
-        toInsert += "(";
-        PsiParameter[] parameters = ((PsiMethod)member).getParameterList().getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-          PsiParameter parameter = parameters[i];
-          if (i != 0) toInsert += ", ";
-          toInsert += parameter.getType().getCanonicalText();
-        }
-        toInsert += ")";
+        toInsert += getParameterString((PsiMethod)member);
       }
     }
     else if (elementAtCaret == null ||
@@ -256,6 +253,18 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider {
     editor.getCaretModel().moveToOffset(caretOffset);
   }
 
+  private static String getParameterString(PsiMethod method) {
+    String toInsert = "(";
+    PsiParameter[] parameters = method.getParameterList().getParameters();
+    for (int i = 0; i < parameters.length; i++) {
+      PsiParameter parameter = parameters[i];
+      if (i != 0) toInsert += ", ";
+      toInsert += parameter.getType().getCanonicalText();
+    }
+    toInsert += ")";
+    return toInsert;
+  }
+
   private static boolean isReferencedTo(PsiReferenceExpression referenceExpression, PsiMember targetElement) {
     PsiElement resolved = referenceExpression.advancedResolve(true).getElement();
     if (!(resolved instanceof PsiMember)) return false;
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy
index 7cc14eb5e78d..fbae4d18ba7e 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy
@@ -49,6 +49,19 @@ public class CopyReferenceTest extends LightCodeInsightFixtureTestCase {
 class Goo { Foo }"""
 
   }
+
+  public void "test paste correct signature to javadoc"() {
+    myFixture.configureByText "a.java", """
+class Foo {
+  void foo(int a) {}
+  void foo<caret>(byte a) {}
+}
+"""
+    performCopy()
+    myFixture.configureByText "b.java", "/** <caret> */"
+    performPaste()
+    myFixture.checkResult "/** Foo#foo(byte)<caret> */"
+  }
   
   public void testFqnInImport() {
     myFixture.addClass("package foo; public class Foo {}")