diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index dcedaba23..be6be9060 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -120,8 +120,7 @@ xnestOpenDisplay(int argc, char *argv[])
                                         sizeof(Colormap));
     for (i = 0; i < xnestNumDefaultColormaps; i++)
         xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay,
-                                                   DefaultRootWindow
-                                                   (xnestDisplay),
+                                                   xnestUpstreamInfo.screenInfo->root,
                                                    xnestVisuals[i].visual,
                                                    AllocNone);
 
@@ -144,7 +143,7 @@ xnestOpenDisplay(int argc, char *argv[])
             if (xnestPixmapFormats[i].depth == 1 ||
                 xnestPixmapFormats[i].depth == xnestDepths[j]) {
                 xnestDefaultDrawables[xnestPixmapFormats[i].depth] =
-                    XCreatePixmap(xnestDisplay, DefaultRootWindow(xnestDisplay),
+                    XCreatePixmap(xnestDisplay, xnestUpstreamInfo.screenInfo->root,
                                   1, 1, xnestPixmapFormats[i].depth);
             }
 
@@ -169,12 +168,12 @@ xnestOpenDisplay(int argc, char *argv[])
 
     xnestIconBitmap =
         XCreateBitmapFromData(xnestDisplay,
-                              DefaultRootWindow(xnestDisplay),
+                              xnestUpstreamInfo.screenInfo->root,
                               (char *) icon_bits, icon_width, icon_height);
 
     xnestScreenSaverPixmap =
         XCreatePixmapFromBitmapData(xnestDisplay,
-                                    DefaultRootWindow(xnestDisplay),
+                                    xnestUpstreamInfo.screenInfo->root,
                                     (char *) screensaver_bits,
                                     screensaver_width,
                                     screensaver_height,
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 8ee6b25bf..eec5f20b0 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -356,7 +356,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
         else
             xnestDefaultWindows[pScreen->myNum] =
                 XCreateWindow(xnestDisplay,
-                              DefaultRootWindow(xnestDisplay),
+                              xnestUpstreamInfo.screenInfo->root,
                               xnestX + POSITION_OFFSET,
                               xnestY + POSITION_OFFSET,
                               xnestWidth, xnestHeight,