# HG changeset patch
# Parent b72439fc1a49c0c072b489b6abecf530cef77272
diff --git a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionLayoutPopup.java b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionLayoutPopup.java
--- a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionLayoutPopup.java
+++ b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionLayoutPopup.java
@@ -301,6 +301,9 @@
         // so force a heavyweight parent by passing in owner==null. (#96717)
         
         JTextComponent owner = Utilities.isMac() ? null : layout.getEditorComponent();
+        if(owner != null && owner.getClientProperty("ForceHeavyweightCompletionPopup") != null) {
+            owner = null;
+        }
         
         // #76648: Autocomplete box is too close to text
         if(displayAboveCaret && Utilities.isMac()) {