diff --git a/pdex/src/processing/mode/experimental/CompletionPanel.java b/pdex/src/processing/mode/experimental/CompletionPanel.java
index e6ed321a7..2bb9607a5 100644
--- a/pdex/src/processing/mode/experimental/CompletionPanel.java
+++ b/pdex/src/processing/mode/experimental/CompletionPanel.java
@@ -189,6 +189,9 @@ public class CompletionPanel {
 
     float h = itemHeight * (itemCount);
 
+    if (itemCount >= 4)
+    	h += itemHeight * 0.3; // a bit of offset
+
     return Math.min(maxHeight, (int) h); // popup menu height
   }
   
@@ -212,7 +215,7 @@ public class CompletionPanel {
     if(w == maxWidth) 
       horizontalScrollBarVisible = true;
     w += editor.dmode.classIcon.getIconWidth(); // add icon width too!
-    w += fm.stringWidth("         "); // a bit of offset
+    w += fm.stringWidth("           "); // a bit of offset
     //log("popup width " + w);
     return w; // popup menu width
   }