diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ebfec726d..f106d3fe5 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-10  Christopher Faylor  <cgf@redhat.com>
+
+	* fhandler_tty.cc (fhandler_tty_slave::open): Don't create a new window
+	station if one already exists.
+
 2003-10-10  Christopher Faylor  <cgf@redhat.com>
 
 	* shared.cc (shared_info::initialize): Remove myself check since
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 5f8ebf31b..8ca49a5d1 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -559,7 +559,8 @@ fhandler_tty_slave::open (int flags, mode_t)
 
   set_open_status ();
   if (fhandler_console::open_fhs++ == 0 && !GetConsoleCP ()
-      && !output_done_event && wincap.pty_needs_alloc_console ())
+      && !output_done_event && wincap.pty_needs_alloc_console ()
+      && !GetProcessWindowStation ())
     {
       BOOL b;
       HWINSTA h = CreateWindowStation (NULL, 0, GENERIC_READ | GENERIC_WRITE, &sec_none_nih);