1 files changed, 10 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 8d5144836a8..c9ae346c47e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1213,6 +1213,11 @@ command_loop_1 ()
   if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
     safe_run_hooks (Qpost_command_hook);
 
+  /* If displaying a message, resize the echo area window to fit
+     that message's size exactly.  */
+  if (!NILP (echo_area_buffer[0]))
+    resize_echo_area_axactly ();
+
   if (!NILP (Vdeferred_action_list))
     call0 (Vdeferred_action_function);
 
@@ -1517,6 +1522,11 @@ command_loop_1 ()
       if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
         safe_run_hooks (Qpost_command_hook);
 
+      /* If displaying a message, resize the echo area window to fit
+         that message's size exactly.  */
+      if (!NILP (echo_area_buffer[0]))
+        resize_echo_area_axactly ();
+
       if (!NILP (Vdeferred_action_list))
         safe_run_hooks (Qdeferred_action_function);