1 files changed, 6 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index c398a85684d..538c0a0d1b0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3995,6 +3995,12 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
   /* Wait until there is input available.  */
   for (;;)
     {
+      /* Break loop if there's an unread command event.  Needed in
+         moused window autoselection which uses a timer to insert such
+         events.  */
+      if (CONSP (Vunread_command_events))
+        break;
+      
       if (kbd_fetch_ptr != kbd_store_ptr)
         break;
 #ifdef HAVE_MOUSE