diff --git a/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java b/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
index 561d9a6a1c4..9947cdaad0d 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
@@ -814,12 +814,12 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
                 x = screen.width - width;
             }
 
+            if (y + height > screen.height) {
+                y = global.y - height;
+            }
             if (y < 0) {
                 y = 0;
             }
-            else if (y + height > screen.height) {
-                y = screen.height - height;
-            }
             return new Rectangle(x, y, width, height);
         }