1 files changed, 4 insertions, 0 deletions

diff --git a/src/window.c b/src/window.c
index 3d807342346..6b6296a807c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1657,6 +1657,10 @@ before each command.")
 
   w = XWINDOW (window);
 
+  if (MINI_WINDOW_P (w)
+      && NILP (call1 (intern ("minibuffer-window-active-p"), window)))
+    error ("Attempt to select inactive minibuffer window");
+
   if (NILP (w->buffer))
     error ("Trying to select deleted window or non-leaf window");