diff --git a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java
index 9eb754008029..5d7b4ca96f50 100644
--- a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java
+++ b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java
@@ -43,7 +43,7 @@ public interface SearchEverywhereContributor<F> {
 
   boolean processSelectedItem(Object selected, int modifiers);
 
-  ListCellRenderer getElementsRenderer();
+  ListCellRenderer getElementsRenderer(JList<?> list);
 
   Object getDataForItem(Object element, String dataId);
 
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
index ce0666dfc867..d3e0efe796f9 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
@@ -45,7 +45,7 @@ import java.util.LinkedList;
 /**
 * @author Konstantin Bulenkov
 */
-class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiElement> {
+public class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiElement> {
 
   private final JList myList;
 
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java
index f198bc2eef1e..c6cb8dfd1f4f 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java
@@ -2,6 +2,7 @@
 package com.intellij.ide.actions.searcheverywhere;
 
 import com.intellij.codeInsight.navigation.NavigationUtil;
+import com.intellij.ide.actions.SearchEverywherePsiRenderer;
 import com.intellij.ide.util.gotoByName.ChooseByNameModel;
 import com.intellij.ide.util.gotoByName.ChooseByNamePopup;
 import com.intellij.ide.util.gotoByName.FilteringGotoByModel;
@@ -14,6 +15,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
 import java.awt.event.InputEvent;
 
 public abstract class AbstractGotoSEContributor<F> implements SearchEverywhereContributor<F> {
@@ -95,6 +97,11 @@ public abstract class AbstractGotoSEContributor<F> implements SearchEverywhereCo
     return null;
   }
 
+  @Override
+  public ListCellRenderer getElementsRenderer(JList<?> list) {
+    return new SearchEverywherePsiRenderer(list);
+  }
+
   protected boolean isDumbModeSupported() {
     return false;
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java
index 32fd08915042..5df04a8dba2a 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java
@@ -85,7 +85,7 @@ public class ActionSearchEverywhereContributor implements SearchEverywhereContri
   }
 
   @Override
-  public ListCellRenderer getElementsRenderer() {
+  public ListCellRenderer getElementsRenderer(JList<?> list) {
     return myModel.getListCellRenderer();
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ClassSearchEverywhereContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ClassSearchEverywhereContributor.java
index 8b655d67464c..b346563415b8 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ClassSearchEverywhereContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ClassSearchEverywhereContributor.java
@@ -2,7 +2,6 @@
 package com.intellij.ide.actions.searcheverywhere;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.ide.util.NavigationItemListCellRenderer;
 import com.intellij.ide.util.gotoByName.FilteringGotoByModel;
 import com.intellij.ide.util.gotoByName.GotoClassModel2;
 import com.intellij.lang.DependentLanguage;
@@ -50,11 +49,6 @@ public class ClassSearchEverywhereContributor extends AbstractGotoSEContributor<
     return new GotoClassModel2(project);
   }
 
-  @Override
-  public ListCellRenderer getElementsRenderer() {
-    return new NavigationItemListCellRenderer();
-  }
-
   public static class Factory implements SearchEverywhereContributorFactory<Language> {
     public static final Function<Language, String> LANGUAGE_NAME_EXTRACTOR = Language::getDisplayName;
     public static final Function<Language, Icon> LANGUAGE_ICON_EXTRACTOR = language -> {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java
index fc1e4a5bcf80..e60d998459ac 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java
@@ -16,7 +16,6 @@ import com.intellij.ui.IdeUICustomization;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.awt.event.InputEvent;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -57,11 +56,6 @@ public class FileSearchEverywhereContributor extends AbstractGotoSEContributor<F
     };
   }
 
-  @Override
-  public ListCellRenderer getElementsRenderer() {
-    return createModel(myProject).getListCellRenderer();
-  }
-
   @Override
   public boolean processSelectedItem(Object selected, int modifiers) {
     //todo maybe another elements types
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
index 66fa101b4368..39a6fb2bc55d 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
@@ -711,7 +711,7 @@ public class SearchEverywhereUI extends BorderLayoutPanel implements Disposable,
       }
 
       SearchEverywhereContributor contributor = myListModel.getContributorForIndex(index);
-      Component component = contributor.getElementsRenderer()
+      Component component = contributor.getElementsRenderer(myResultsList)
                                        .getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 
       if (isAllTabSelected() && myListModel.isGroupFirstItem(index)) {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SymbolSearchEverywhereContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SymbolSearchEverywhereContributor.java
index 35c4979cb2e2..85e55fb241ad 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SymbolSearchEverywhereContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SymbolSearchEverywhereContributor.java
@@ -2,7 +2,6 @@
 package com.intellij.ide.actions.searcheverywhere;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.ide.util.NavigationItemListCellRenderer;
 import com.intellij.ide.util.gotoByName.FilteringGotoByModel;
 import com.intellij.ide.util.gotoByName.GotoSymbolModel2;
 import com.intellij.lang.DependentLanguage;
@@ -14,7 +13,6 @@ import com.intellij.ui.IdeUICustomization;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -48,11 +46,6 @@ public class SymbolSearchEverywhereContributor extends AbstractGotoSEContributor
     return new GotoSymbolModel2(project);
   }
 
-  @Override
-  public ListCellRenderer getElementsRenderer() {
-    return new NavigationItemListCellRenderer();
-  }
-
   public static class Factory implements SearchEverywhereContributorFactory<Language> {
     @NotNull
     @Override
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java
index 2b0367dc3c4b..7aba5c3866de 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java
@@ -123,7 +123,7 @@ public class TopHitSEContributor implements SearchEverywhereContributor<Void> {
   }
 
   @Override
-  public ListCellRenderer getElementsRenderer() {
+  public ListCellRenderer getElementsRenderer(JList<?> list) {
     return new TopHitRenderer(myProject);
   }