# HG changeset patch
# Parent e6157aa9be5b227f149d85656e757e43f7774122

diff -r e6157aa9be5b editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java
--- a/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	Thu Nov 24 12:38:05 2011 +0200
+++ b/editor.completion/src/org/netbeans/modules/editor/completion/CompletionImpl.java	Thu Nov 24 12:49:23 2011 +0200
@@ -784,7 +784,8 @@
                         }
                     }
                     // Call default action if ENTER was pressed
-                    if (e.getKeyCode() == KeyEvent.VK_ENTER && e.getID() == KeyEvent.KEY_PRESSED) {
+                    // see http://netbeans.org/bugzilla/show_bug.cgi?id=205515
+                    if (e.getKeyCode() == KeyEvent.VK_ENTER && e.getID() == KeyEvent.KEY_PRESSED && e.getModifiersEx()==0) {
                         e.consume();
                         if (guardedPos) {
                             Toolkit.getDefaultToolkit().beep();