diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/ChooseOneOrAllRunnable.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/ChooseOneOrAllRunnable.java
index b214d25f7634..8dc0177298d0 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/ChooseOneOrAllRunnable.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/ChooseOneOrAllRunnable.java
@@ -65,8 +65,8 @@ public abstract class ChooseOneOrAllRunnable<T extends PsiElement> implements Ru
 
       final IPopupChooserBuilder builder = JBPopupFactory.getInstance()
         .createPopupChooserBuilder(model)
-        .setRenderer((list, value, index, isSelected, cellHasFocus) ->
-          ((ListCellRenderer<Object>)renderer).getListCellRendererComponent(list, value, index, isSelected, cellHasFocus))
+        .setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
+        .setRenderer(renderer)
         .setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         .setItemChosenCallback((selectedValue) -> {
           if (selectedValue.equals(selectAll)) {