diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 76f8990e8..bc99df961 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -187,8 +187,8 @@ xnestOpenDisplay(int argc, char *argv[])
                               (char *) icon_bits, icon_width, icon_height);
 
     xnestScreenSaverPixmap =
-        XCreatePixmapFromBitmapData(xnestDisplay,
-                                    xnestUpstreamInfo.screenInfo->root,
+        xnestCreatePixmapFromBitmapData(xnestUpstreamInfo.conn,
+                                        xnestUpstreamInfo.screenInfo->root,
                                     (char *) screensaver_bits,
                                     screensaver_width,
                                     screensaver_height,
diff --git a/hw/xnest/xcb.c b/hw/xnest/xcb.c
index de764b8a5..17996b5ad 100644
--- a/hw/xnest/xcb.c
+++ b/hw/xnest/xcb.c
@@ -206,3 +206,44 @@ uint32_t xnestCreateBitmapFromData(
     xcb_free_gc(conn, gc);
     return pix;
 }
+
+uint32_t xnestCreatePixmapFromBitmapData(
+    xcb_connection_t *conn,
+    uint32_t drawable,
+    const char *data,
+    uint32_t width,
+    uint32_t height,
+    uint32_t fg,
+    uint32_t bg,
+    uint16_t depth)
+{
+    uint32_t pix = xcb_generate_id(xnestUpstreamInfo.conn);
+    xcb_create_pixmap(conn, depth, pix, drawable, width, height);
+
+    uint32_t gc = xcb_generate_id(xnestUpstreamInfo.conn);
+    xcb_create_gc(conn, gc, pix, 0, NULL);
+
+    XnGCValues gcv = {
+        .foreground = fg,
+        .background = bg
+    };
+
+    xnChangeGC(conn, gc, gcv, XCB_GC_FOREGROUND | XCB_GC_BACKGROUND);
+
+    const int leftPad = 0;
+    xcb_put_image(conn,
+                  XYBitmap,
+                  pix,
+                  gc,
+                  width,
+                  height,
+                  0 /* dst_x */,
+                  0 /* dst_y */,
+                  leftPad,
+                  1 /* depth */,
+                  BitmapBytePad(width + leftPad) * height,
+                  (uint8_t*)data);
+
+    xcb_free_gc(conn, gc);
+    return pix;
+}
diff --git a/hw/xnest/xnest-xcb.h b/hw/xnest/xnest-xcb.h
index 062cb142c..d5606dbef 100644
--- a/hw/xnest/xnest-xcb.h
+++ b/hw/xnest/xnest-xcb.h
@@ -100,4 +100,8 @@ void xnestWMColormapWindows(xcb_connection_t *conn, xcb_window_t w, xcb_window_t
 uint32_t xnestCreateBitmapFromData(xcb_connection_t *conn, uint32_t drawable,
                                    const char *data, uint32_t width, uint32_t height);
 
+uint32_t xnestCreatePixmapFromBitmapData(xcb_connection_t *conn, uint32_t drawable,
+                                         const char *data, uint32_t width, uint32_t height,
+                                         uint32_t fg, uint32_t bg, uint16_t depth);
+
 #endif /* __XNEST__XCB_H */