--- a/ModalBox.st	Fri Oct 22 14:55:58 2010 +0200
+++ b/ModalBox.st	Fri Oct 22 14:56:26 2010 +0200
@@ -783,18 +783,18 @@
 
     |first pointerPosition positionOffset pos monitorBounds alignedPos|
 
-"/ ****** MULTI SCREEN
+    "/ ****** MULTI SCREEN
 
     pointerPosition := device pointerPosition.
-    monitorBounds := device monitorBoundsAt:pointerPosition.
 
     self fixSize.
     positionOffset := self positionOffset.
-    pos := pointerPosition - positionOffset.
+    pos := alignedPos := pointerPosition - positionOffset.
 
-    alignedPos := Point
-        x:(pos x max:monitorBounds left)
-        y:(pos y max:monitorBounds top).
+    UserPreferences current forceWindowsIntoMonitorBounds ifTrue:[
+        monitorBounds := device monitorBoundsAt:pointerPosition.
+        alignedPos := (pos x max:monitorBounds left) @ (pos y max:monitorBounds top).
+    ].
 
     positionOffset := pointerPosition - alignedPos.
 
@@ -831,7 +831,7 @@
      b showAtPointer.
     "
 
-    "Modified: 7.3.1996 / 17:56:53 / cg"
+    "Modified: / 22-10-2010 / 11:20:05 / cg"
 !
 
 showAtPointerNotCovering:aView
@@ -910,11 +910,11 @@
 !ModalBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.105 2010-10-11 11:24:09 mb Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.106 2010-10-22 12:56:26 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.105 2010-10-11 11:24:09 mb Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.106 2010-10-22 12:56:26 cg Exp $'
 ! !
 
 ModalBox initialize!