diff --git a/lib/x11/xcore.js b/lib/x11/xcore.js
index 648a83e..61f4f81 100644
--- a/lib/x11/xcore.js
+++ b/lib/x11/xcore.js
@@ -302,6 +302,7 @@ XClient.prototype.startHandshake = function()
         // emit error in that case
         client.expectReplyHeader();
         client.display = display;
+        display.client = client;
         client.emit('connect', display);
     });   
 }
@@ -351,7 +352,6 @@ module.exports.createClient = function(initCb, display)
     if (initCb)
     {
         client.on('connect', function(display) {
-            display.client = client;
             initCb(display);
         });
     }