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 6d0fa7a0f6d9..bbef0f6ee782 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
@@ -1376,7 +1376,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
           Dimension adSize = myAdComponent.getAdComponent().getPreferredSize();
 
-          int panelHeight = myList.getPreferredSize().height + adSize.height;
+          int panelHeight = myList.getPreferredScrollableViewportSize().height + adSize.height;
           if (getListModel().getSize() > myList.getVisibleRowCount() && myList.getVisibleRowCount() >= 5) {
             panelHeight -= myList.getFixedCellHeight() / 2;
           }