1 files changed, 9 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index ec62bdd9d..3e27ae566 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1015,14 +1015,21 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
      * from the window manager via _NET_REQUEST_FRAME_EXTENTS
      */
 
-    if (nxagentOption(WMBorderWidth) > 0 && nxagentOption(WMTitleHeight) > 0)
+    if (nxagentOption(WMBorderWidth) > 0)
     {
       nxagentChangeOption(X, nxagentOption(SavedX) - nxagentOption(WMBorderWidth));
-      nxagentChangeOption(Y, nxagentOption(SavedY) - nxagentOption(WMTitleHeight));
     }
     else
     {
       nxagentChangeOption(X, nxagentOption(SavedX));
+    }
+
+    if (nxagentOption(WMTitleHeight) > 0)
+    {
+      nxagentChangeOption(Y, nxagentOption(SavedY) - nxagentOption(WMTitleHeight));
+    }
+    else
+    {
       nxagentChangeOption(Y, nxagentOption(SavedY));
     }