diff --git a/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java b/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java
index 7c9075e759f4..697556cc9f46 100644
--- a/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java
+++ b/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java
@@ -603,7 +603,7 @@ public abstract class PerFileConfigurableBase<T> implements SearchableConfigurab
       protected ComboBoxButton createComboBoxButton(Presentation presentation) {
         return new ComboBoxButton(presentation) {
           protected JBPopup createPopup(Runnable onDispose) {
-            JBPopup popup = createValueEditorPopup(target, onDispose, getDataContext(), o -> {
+            JBPopup popup = createValueEditorPopup(target, value.produce(), onDispose, getDataContext(), o -> {
               consumer.consume(o);
               updateText();
             });
@@ -617,6 +617,7 @@ public abstract class PerFileConfigurableBase<T> implements SearchableConfigurab
 
   @NotNull
   protected JBPopup createValueEditorPopup(@Nullable Object target,
+                                           @Nullable T value,
                                            @Nullable Runnable onDispose,
                                            @NotNull DataContext dataContext,
                                            @NotNull Consumer<T> onChosen) {