diff --git a/server-client.c b/server-client.c
index a9348997..84ae86bc 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1187,6 +1187,11 @@ server_client_msg_identify(struct client *c, struct imsg *imsg)
 		return;
 	c->flags |= CLIENT_IDENTIFIED;
 
+#ifdef __CYGWIN__
+	c->fd = open(c->ttyname, O_RDWR|O_NOCTTY);
+	c->cwd = open(".", O_RDONLY);
+#endif
+
 	if (c->flags & CLIENT_CONTROL) {
 		c->stdin_callback = control_callback;