diff --git a/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java
index 1d5f37311b25..6b298e6c04a0 100644
--- a/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java
+++ b/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java
@@ -19,13 +19,12 @@ import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFunctionalExpression;
 import com.intellij.psi.PsiMethod;
+import com.intellij.psi.presentation.java.ClassPresentationUtil;
 import com.intellij.psi.util.PsiFormatUtil;
 import com.intellij.psi.util.PsiFormatUtilBase;
 
 import javax.swing.*;
 
-import static com.intellij.ide.util.PsiClassOrFunctionalExpressionListCellRenderer.renderFunctionalExpression;
-
 public class MethodOrFunctionalExpressionCellRenderer extends PsiElementListCellRenderer<NavigatablePsiElement> {
   private final MethodCellRenderer myMethodCellRenderer;
   
@@ -37,8 +36,8 @@ public class MethodOrFunctionalExpressionCellRenderer extends PsiElementListCell
   }
 
   public String getElementText(NavigatablePsiElement element) {
-    return element instanceof PsiMethod ? myMethodCellRenderer.getElementText((PsiMethod)element) 
-                                        : renderFunctionalExpression((PsiFunctionalExpression)element);
+    return element instanceof PsiMethod ? myMethodCellRenderer.getElementText((PsiMethod)element)
+                                        : ClassPresentationUtil.getFunctionalExpressionPresentation((PsiFunctionalExpression)element, false);
   }
 
   protected Icon getIcon(PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/ide/util/PsiClassOrFunctionalExpressionListCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/PsiClassOrFunctionalExpressionListCellRenderer.java
index 589202aeb04a..5756e0145825 100644
--- a/java/java-impl/src/com/intellij/ide/util/PsiClassOrFunctionalExpressionListCellRenderer.java
+++ b/java/java-impl/src/com/intellij/ide/util/PsiClassOrFunctionalExpressionListCellRenderer.java
@@ -15,22 +15,16 @@
  */
 package com.intellij.ide.util;
 
-import com.intellij.extapi.psi.StubBasedPsiElementBase;
 import com.intellij.psi.NavigatablePsiElement;
-import com.intellij.psi.PsiBundle;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiFunctionalExpression;
-import com.intellij.psi.impl.java.stubs.FunctionalExpressionStub;
 import com.intellij.psi.presentation.java.ClassPresentationUtil;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.util.PsiExpressionTrimRenderer;
-import org.jetbrains.annotations.NotNull;
 
 public class PsiClassOrFunctionalExpressionListCellRenderer extends PsiElementListCellRenderer<NavigatablePsiElement> {
   @Override
   public String getElementText(NavigatablePsiElement element) {
-    return element instanceof PsiClass ? ClassPresentationUtil.getNameForClass((PsiClass)element, false) 
-                                       : renderFunctionalExpression((PsiFunctionalExpression)element);
+    return element instanceof PsiClass ? ClassPresentationUtil.getNameForClass((PsiClass)element, false)
+                                       : ClassPresentationUtil.getFunctionalExpressionPresentation((PsiFunctionalExpression)element, false);
   }
 
   @Override
@@ -42,13 +36,4 @@ public class PsiClassOrFunctionalExpressionListCellRenderer extends PsiElementLi
   protected int getIconFlags() {
     return 0;
   }
-
-  @NotNull
-  static String renderFunctionalExpression(@NotNull PsiFunctionalExpression expression) {
-    final StubElement stub = ((StubBasedPsiElementBase<?>)expression).getGreenStub();
-    final String lambdaText = stub instanceof FunctionalExpressionStub
-                              ? ((FunctionalExpressionStub)stub).getPresentableText()
-                              : PsiExpressionTrimRenderer.render(expression);
-    return PsiBundle.message("class.context.display", lambdaText, ClassPresentationUtil.getContextName(expression, false));
-  }
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/presentation/java/ClassPresentationUtil.java b/java/java-psi-impl/src/com/intellij/psi/presentation/java/ClassPresentationUtil.java
index 7fdfa500efc3..599aa674e3d1 100644
--- a/java/java-psi-impl/src/com/intellij/psi/presentation/java/ClassPresentationUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/presentation/java/ClassPresentationUtil.java
@@ -15,7 +15,11 @@
  */
 package com.intellij.psi.presentation.java;
 
+import com.intellij.extapi.psi.StubBasedPsiElementBase;
 import com.intellij.psi.*;
+import com.intellij.psi.impl.java.stubs.FunctionalExpressionStub;
+import com.intellij.psi.stubs.StubElement;
+import com.intellij.psi.util.PsiExpressionTrimRenderer;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -78,6 +82,10 @@ public class ClassPresentationUtil {
   }
 
   public static String getFunctionalExpressionPresentation(PsiFunctionalExpression functionalExpression, boolean qualified) {
-    return "Functional expression in " + getContextName(functionalExpression, qualified);
+    final StubElement stub = ((StubBasedPsiElementBase<?>)functionalExpression).getGreenStub();
+    final String lambdaText = stub instanceof FunctionalExpressionStub
+                              ? ((FunctionalExpressionStub)stub).getPresentableText()
+                              : PsiExpressionTrimRenderer.render(functionalExpression);
+    return PsiBundle.message("class.context.display", lambdaText, getContextName(functionalExpression, qualified)) ;
   }
 }