--- a/Workspace.st	Tue Sep 03 11:34:29 2013 +0200
+++ b/Workspace.st	Tue Sep 03 14:16:00 2013 +0200
@@ -32,7 +32,7 @@
 	privateIn:Workspace
 !
 
-Workspace comment:'declared from: ..\..\..\stx\libwidg\abbrev.stc'
+Workspace comment:''
 !
 
 !Workspace class methodsFor:'documentation'!
@@ -2200,7 +2200,11 @@
 
     (completionView isNil or:[completionView realized not]) ifTrue:[
         (key == #Control_L or:[ key == #Control_R or:[ key == #Control]]) ifTrue:[
-            self updateCompletionList
+            editView hasSelection ifFalse:[
+                UserPreferences current codeCompletionOnControlKey ifTrue:[
+                    self updateCompletionList
+                ]
+            ].
         ].
         ^ false.
     ].
@@ -2208,17 +2212,14 @@
     key isCharacter ifFalse:[
         "/ forward to menu
         completionView notNil ifTrue:[
-            (key == #CursorDown or:[ key == #CursorUp]) ifTrue:[
+            (key == #CursorDown 
+                or:[ (key == #CursorUp)
+                or:[ ((key == #Return) and:[ completionView hasSelection ])
+            ]]) ifTrue:[
                 "/ forward to completion view
                 completionView sensor pushUserEvent:#value for:[ completionView keyPress:key x:0 y:0 ].
                 ^ true.
             ].
-            (key == #Return) ifTrue:[
-                completionView hasSelection ifTrue:[
-                    completionView sensor pushUserEvent:#value for:[ completionView keyPress:key x:0 y:0 ].
-                    ^ true.
-                ]
-            ].
             (key == #Control_L or:[ key == #Control_R or:[ key == #Control]]) ifTrue:[
                 ^ false
             ].
@@ -2483,10 +2484,10 @@
 !Workspace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.286 2013-09-03 09:34:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.287 2013-09-03 12:16:00 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.286 2013-09-03 09:34:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.287 2013-09-03 12:16:00 cg Exp $'
 ! !