diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b4e21f716..4e55b540d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-20  Christopher Faylor  <cgf@timesys.com>
+
+	* fhandler_tty.cc (fhandler_tty_slave::open): Reinstate call to
+	need_invisible on first pty open.
+
 2006-05-18  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_console.cc (fhandler_console::need_invisible): Allocate an
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 2cf551a9f..19759247a 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -576,7 +576,9 @@ fhandler_tty_slave::open (int flags, mode_t)
   set_output_handle (to_master_local);
 
   set_open_status ();
-  cygheap->manage_console_count ("fhandler_tty_slave::open", 1);
+  if (cygheap->manage_console_count ("fhandler_tty_slave::open", 1) == 1
+      && !output_done_event)
+    fhandler_console::need_invisible ();
 
   // FIXME: Do this better someday
   arch = (fhandler_tty_slave *) cmalloc (HEAP_ARCHETYPES, sizeof (*this));