diff --git a/pdex/src/processing/mode/experimental/CompletionPanel.java b/pdex/src/processing/mode/experimental/CompletionPanel.java
index 1f62ecb6b..e3c8ec4ef 100644
--- a/pdex/src/processing/mode/experimental/CompletionPanel.java
+++ b/pdex/src/processing/mode/experimental/CompletionPanel.java
@@ -24,7 +24,7 @@ public class CompletionPanel {
 
   private String subWord;
 
-  private final int insertionPosition;
+  private int insertionPosition;
 
   private TextArea textarea;
 
@@ -75,10 +75,15 @@ public class CompletionPanel {
     return list;
   }
   
-  public boolean updateList(final CompletionCandidate[] items){
-    ListModel lm = completionList.getModel();
-    DefaultListModel dlm = new DefaultListModel();
-    
+  public boolean updateList(final DefaultListModel items, String newSubword, int position){    
+    completionList.setModel(items);
+    completionList.validate();
+    completionList.repaint();
+    completionList.setSelectedIndex(0);
+    this.subWord = new String(newSubword);
+    if (subWord.indexOf('.') != -1)
+      this.subWord = subWord.substring(subWord.lastIndexOf('.') + 1);
+    insertionPosition = position;
     return true;
   }
 
diff --git a/pdex/src/processing/mode/experimental/TextArea.java b/pdex/src/processing/mode/experimental/TextArea.java
index 77b054cdd..982d83e7b 100644
--- a/pdex/src/processing/mode/experimental/TextArea.java
+++ b/pdex/src/processing/mode/experimental/TextArea.java
@@ -100,7 +100,7 @@ public class TextArea extends JEditTextArea {
     MouseHandler mouseHandler = new MouseHandler();
     painter.addMouseListener(mouseHandler);
     painter.addMouseMotionListener(mouseHandler);
-    addCompletionPopupListner();
+    //addCompletionPopupListner();
     add(CENTER, painter);
 
     // load settings from theme.txt
@@ -600,6 +600,7 @@ public class TextArea extends JEditTextArea {
 
   //JEditTextArea textarea;
 
+  // worthless
   private void addCompletionPopupListner() {
     this.addKeyListener(new KeyListener() {
 
@@ -646,19 +647,21 @@ public class TextArea extends JEditTextArea {
     if(defListModel.size() == 0){
       return;
     }
-    
-    hideSuggestion();    
-    final int position = getCaretPosition();
-    Point location = new Point();
-    try {
-      location.x = offsetToX(getCaretLine(), position
-          - getLineStartOffset(getCaretLine()));
-      location.y = lineToY(getCaretLine())
-          + getPainter().getFontMetrics().getHeight();
-    } catch (Exception e2) {
-      e2.printStackTrace();
-      return;
-    }
+    String subWord = null;
+    int position = getCaretPosition();
+//    if (suggestion == null || !suggestion.isVisible()) {
+      Point location = new Point();
+      try {
+        location.x = offsetToX(getCaretLine(), position
+            - getLineStartOffset(getCaretLine()));
+        location.y = lineToY(getCaretLine())
+            + getPainter().getFontMetrics().getHeight();
+      } catch (Exception e2) {
+        e2.printStackTrace();
+        return;
+      }
+      
+//    }
     
     String text = getText();
     int start = Math.max(0, position - 1);
@@ -670,17 +673,21 @@ public class TextArea extends JEditTextArea {
         break;
       }
     }
-    
+
     if (start > position) {
       return;
     }
-    
-    final String subWord = text.substring(start, position);
+
+    subWord = text.substring(start, position);
     if (subWord.length() < 2) {
       return;
     }
-    
-    suggestion = new CompletionPanel(this, position, subWord, defListModel, location);
+    if(suggestion == null)
+      suggestion = new CompletionPanel(this, position, subWord, defListModel,
+                                     location);
+    else
+      suggestion.updateList(defListModel, subWord, position);
+
 //    requestFocusInWindow();
     SwingUtilities.invokeLater(new Runnable() {
       @Override
@@ -693,6 +700,7 @@ public class TextArea extends JEditTextArea {
   private void hideSuggestion() {
     if (suggestion != null) {
       suggestion.hideSuggestion();
+      suggestion = null;
     }
   }