diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 0290e11b7c82..e88a0000a191 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -93,11 +93,10 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable,
       super.processKeyEvent(e);
     }
 
-    ExpandableItemsHandler<Integer> myExtender = new CompletionExtender(this);
     @NotNull
     @Override
-    public ExpandableItemsHandler<Integer> getExpandableItemsHandler() {
-      return myExtender;
+    protected ExpandableItemsHandler<Integer> createExpandableItemsHandler() {
+      return new CompletionExtender(this);
     }
   };
   final LookupCellRenderer myCellRenderer;
diff --git a/platform/platform-api/src/com/intellij/ui/components/JBList.java b/platform/platform-api/src/com/intellij/ui/components/JBList.java
index 6d14c60faa48..da76c0303892 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBList.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBList.java
@@ -173,7 +173,7 @@ public class JBList extends JList implements ComponentWithEmptyText, ComponentWi
       }
     };
 
-    myExpandableItemsHandler = ExpandableItemsHandlerFactory.install(this);
+    myExpandableItemsHandler = createExpandableItemsHandler();
     setCellRenderer(new DefaultListCellRenderer());
   }
 
@@ -202,6 +202,11 @@ public class JBList extends JList implements ComponentWithEmptyText, ComponentWi
     return myExpandableItemsHandler;
   }
 
+  @NotNull
+  protected ExpandableItemsHandler<Integer> createExpandableItemsHandler() {
+    return ExpandableItemsHandlerFactory.install(this);
+  }
+
   @Override
   public void setExpandableItemsEnabled(boolean enabled) {
     myExpandableItemsHandler.setEnabled(enabled);