diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt
index 1b24471f9cf..0ac00825641 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt
@@ -117,8 +117,8 @@ class LookupElementsCollector(
 
                                 val tails = presentation.getTailFragments()
                                 presentation.clearTail()
-                                presentation.appendTailText(" " + buildLambdaPresentation(parameterType), false)
-                                tails.drop(1)/*drop old function signature*/.forEach { presentation.appendTailText(it.text, it.isGrayed()) }
+                                presentation.appendTailText(" " + buildLambdaPresentation(parameterType) + " ", false)
+                                tails.forEach { presentation.appendTailText(it.text, true) }
                             }
 
                             override fun handleInsert(context: InsertionContext) {
diff --git a/idea/idea-completion/testData/basic/common/HigherOrderFunction1.kt b/idea/idea-completion/testData/basic/common/HigherOrderFunction1.kt
index 0f040ffe8ce..b1294efbb1a 100644
--- a/idea/idea-completion/testData/basic/common/HigherOrderFunction1.kt
+++ b/idea/idea-completion/testData/basic/common/HigherOrderFunction1.kt
@@ -5,4 +5,4 @@ fun test() {
 }
 
 // EXIST: { lookupString:"foo", itemText: "foo", tailText: "(p: (String, Char) -> Unit) (<root>)", typeText:"Unit" }
-// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } (<root>)", typeText:"Unit" }
+// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } (p: (String, Char) -> Unit) (<root>)", typeText:"Unit" }
diff --git a/idea/idea-completion/testData/basic/common/HigherOrderFunction2.kt b/idea/idea-completion/testData/basic/common/HigherOrderFunction2.kt
index ee9b2aad939..187b40286b0 100644
--- a/idea/idea-completion/testData/basic/common/HigherOrderFunction2.kt
+++ b/idea/idea-completion/testData/basic/common/HigherOrderFunction2.kt
@@ -5,4 +5,4 @@ fun test() {
 }
 
 // EXIST: { lookupString:"foo", itemText: "foo", tailText: "(p: (String, Char) -> Unit) for String in <root>", typeText:"Unit" }
-// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } for String in <root>", typeText:"Unit" }
+// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } (p: (String, Char) -> Unit) for String in <root>", typeText:"Unit" }
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt
index 4f853bc548d..61cc344f32d 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt
@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt.after
index dcc55fac961..f01aed33a0d 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt.after
@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt
index f8ece805cfb..5812622ae3a 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt
@@ -6,5 +6,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt.after
index bc480d4e9e9..d93c83af6b4 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt.after
@@ -6,5 +6,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt
index 1e6481d03d6..bb24097bda3 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt
@@ -5,5 +5,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: "foo"
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 // CHAR: '\t'
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt.after
index d7a7884dcdf..84c3a3a45ab 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt.after
@@ -5,5 +5,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: "foo"
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 // CHAR: '\t'
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt
index 327a06bba0f..fabc6e2ca4f 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt
@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt.after
index 42a9678079b..afa51f761e8 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt.after
@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt
index 880d6e96240..ccfb1509882 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt
@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
diff --git a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt.after b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt.after
index ecb94d95e39..0cdd9c1d123 100644
--- a/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt.after
@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"