1 files changed, 4 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 19f8dbb3b57..cb9ce1f9921 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -750,6 +750,10 @@ recursive_edit_1 ()
   val = command_loop ();
   if (EQ (val, Qt))
     Fsignal (Qquit, Qnil);
+  /* Handle throw from read_minibuf when using minibuffer
+     while it's active but we're in another window.  */
+  if (STRINGP (val))
+    Fsignal (Qerror, Fcons (val, Qnil));
 
   return unbind_to (count, Qnil);
 }