Index: editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/AbbrevDetection.java
===================================================================
RCS file: /cvs/editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/AbbrevDetection.java,v
retrieving revision 1.17
diff -u -u -r1.17 AbbrevDetection.java
--- editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/AbbrevDetection.java	1 Oct 2007 15:43:48 -0000	1.17
+++ editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/AbbrevDetection.java	12 Oct 2007 15:39:24 -0000
@@ -99,7 +99,7 @@
     private static final String ABBREV_IGNORE_MODIFICATION_DOC_PROPERTY
             = "abbrev-ignore-modification"; // NOI18N
 
-    private static final String COMPLETION_ACTIVE = "completion-active"; // NOI18N
+    private static final String COMPLETION_VISIBLE = "completion-visible"; // NOI18N
 
     private static final String SURROUND_WITH = NbBundle.getMessage(SurroundWithFix.class, "TXT_SurroundWithHint_Label"); //NOI18N
     private static final int SURROUND_WITH_DELAY = 250;
@@ -243,7 +243,7 @@
     }
     
     private boolean isAbbrevDisabled() {
-        return org.netbeans.editor.Abbrev.isAbbrevDisabled(component) || Boolean.TRUE.equals(component.getClientProperty(COMPLETION_ACTIVE));
+        return org.netbeans.editor.Abbrev.isAbbrevDisabled(component) || Boolean.TRUE.equals(component.getClientProperty(COMPLETION_VISIBLE));
     }
     
     private void checkExpansionKeystroke(KeyEvent evt) {
Index: editor/completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
===================================================================
RCS file: /cvs/editor/completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java,v
retrieving revision 1.85
diff -u -u -r1.85 CompletionImpl.java
--- editor/completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	1 Oct 2007 15:44:28 -0000	1.85
+++ editor/completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	12 Oct 2007 15:39:24 -0000
@@ -837,6 +837,7 @@
                 }
                 
                 int selectedIndex = getCompletionPreSelectionIndex(sortedResultItems);
+                getActiveComponent().putClientProperty("completion-visible", Boolean.TRUE);
                 layout.showCompletion(noSuggestions ? Collections.singletonList(NO_SUGGESTIONS) : sortedResultItems, displayTitle, displayAnchorOffset, CompletionImpl.this, displayAdditionalItems ? completionShortcut : null, selectedIndex);
                 pleaseWaitDisplayed = false;
 
@@ -909,6 +910,7 @@
         if (!completionOnly && hidePerformed && CompletionSettings.INSTANCE.documentationAutoPopup()) {
             hideDocumentation(true);
         }
+        getActiveComponent().putClientProperty("completion-visible", Boolean.FALSE);
         getActiveComponent().putClientProperty("completion-active", Boolean.FALSE);
         return hidePerformed;
     }