# HG changeset patch
# Parent  8f95183f7ee8a2787723706a45feb4644e8df1b1

diff --git a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
--- a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
+++ b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
@@ -879,14 +879,20 @@
                         if(baseDoc != null)
                             baseDoc.atomicUnlock();
                     }
-                    return;
+                    if(useTabToComplete())
+                        return;
                 }
             }
-            CompletionItem item = layout.getSelectedCompletionItem();
-            if (item != null)
-                item.defaultAction(c);
+            if(useTabToComplete()) {
+                CompletionItem item = layout.getSelectedCompletionItem();
+                if (item != null)
+                    item.defaultAction(c);
+            }
         }
     }
+    private boolean useTabToComplete() {
+        return !Boolean.getBoolean("editor.completion.TabOnlyForPrefix");
+    }
     
     /**
      * May be called from any thread but it will be rescheduled into AWT.