diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index faa4c8215..6a090c0ac 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-01  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* select.cc (peek_console): Always check window size when there is ANY
+	keyboard activity.
+
 2009-08-26  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.h (INTERIX_SYMLINK_COOKIE): Define.
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index 6e46c4ed1..cb58445c9 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -812,6 +812,7 @@ peek_console (select_record *me, bool)
       break;
     else
       {
+	fh->send_winch_maybe ();
 	if (irec.EventType == KEY_EVENT)
 	  {
 	    if (irec.Event.KeyEvent.bKeyDown
@@ -821,7 +822,6 @@ peek_console (select_record *me, bool)
 	  }
 	else
 	  {
-	    fh->send_winch_maybe ();
 	    if (irec.EventType == MOUSE_EVENT
 		&& fh->mouse_aware ()
 		&& (irec.Event.MouseEvent.dwEventFlags == 0