diff --git a/ssh1connection.c b/ssh1connection.c
index cf1616d6..3ae36bd3 100644
--- a/ssh1connection.c
+++ b/ssh1connection.c
@@ -751,6 +751,7 @@ static void ssh1_connection_process_queue(PacketProtocolLayer *ppl)
     }
 
     s->session_ready = TRUE;
+    ssh_ppl_got_user_input(&s->ppl); /* in case any input is already queued */
 
     /* If an EOF or a window-size change arrived before we were ready
      * to handle either one, handle them now. */
diff --git a/ssh2connection.c b/ssh2connection.c
index 38566dc0..ea03f575 100644
--- a/ssh2connection.c
+++ b/ssh2connection.c
@@ -1335,8 +1335,10 @@ static void ssh2_connection_process_queue(PacketProtocolLayer *ppl)
     }
 
     s->mainchan_ready = TRUE;
-    if (s->mainchan)
+    if (s->mainchan) {
 	s->want_user_input = TRUE;
+        ssh_ppl_got_user_input(&s->ppl); /* in case any is already queued */
+    }
 
     /* If an EOF or a window-size change arrived before we were ready
      * to handle either one, handle them now. */