--- a/EditFieldWithCompletion.st	Wed Apr 04 12:12:00 2012 +0100
+++ b/EditFieldWithCompletion.st	Wed Apr 04 17:35:25 2012 +0100
@@ -343,6 +343,8 @@
 
 showOptionsWindow
 
+    | x y w |
+
     showOptions ifFalse:[^ self].
     optionsWindow notNil ifTrue:[ ^ self ].
 
@@ -360,14 +362,19 @@
                     highlightMode: #line;
                     font:self font;
                     backgroundColor:self backgroundColor;
-                    delegate: self.
+                    delegate: self;
+                    yourself.
+
+    x := self absoluteLeft + 5" - optionsView textStartLeft".
+    y := self absoluteTop + self height + 1 + 5.
+    w := (width * 2) + 0"((optionsView textStartLeft) * 2)".
 
     optionsWindow := StandardSystemView new
         bePopUpView;
         beSlave;        
-        origin:(self absoluteLeft + 5" - optionsView textStartLeft") 
-                    @ (self absoluteTop + self height + 1 + 5)
-        extent:(width + 0"((optionsView textStartLeft) * 2)") @ (fontHeight * 10).
+        origin:x @ y
+        extent:(w min: (Screen current width - x)) @ (fontHeight * 10);
+        yourself.
 
     ScrollableView   
         forView:optionsView 
@@ -384,8 +391,8 @@
 
     "Created: / 09-08-2009 / 08:12:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 09-08-2009 / 09:28:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 09-12-2010 / 22:05:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 29-11-2011 / 11:27:13 / cg"
+    "Modified: / 04-04-2012 / 13:08:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 startCompletion
@@ -403,5 +410,5 @@
 !
 
 version_SVN
-    ^ '$Id: EditFieldWithCompletion.st 7961 2012-03-31 00:16:30Z vranyj1 $'
+    ^ '$Id: EditFieldWithCompletion.st 7969 2012-04-04 16:35:25Z vranyj1 $'
 ! !