diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 58ec8aa..10050e3 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -169,6 +169,7 @@
 
       cp.width = server->pb->width();
       cp.height = server->pb->height();
+      cp.screenLayout = server->screenLayout;
       if (state() == RFBSTATE_NORMAL) {
         if (!writer()->writeSetDesktopSize() &&
             !writer()->writeExtendedDesktopSize()) {
@@ -329,6 +330,7 @@
   // - Set the connection parameters appropriately
   cp.width = server->pb->width();
   cp.height = server->pb->height();
+  cp.screenLayout = server->screenLayout;
   cp.setName(server->getName());
   
   // - Set the default pixel format