diff --git a/controls/combo.c b/controls/combo.c
index 3ff0f2751d7..83e706520f0 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1210,9 +1210,9 @@ static void CBDropDown( LPHEADCOMBO lphc )
       if (nDroppedHeight < nIHeight)
       {
             if (nItems < 5)
-                nDroppedHeight = nHeight;
+                nDroppedHeight = (nItems+1)*nIHeight;
             else
-                nDroppedHeight = 5*nIHeight;
+                nDroppedHeight = 6*nIHeight;
       }
    }