diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 6a6e9548508..53686b89f6f 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1511,7 +1511,8 @@ or in a newly created frame (if the selected frame has no other windows)."
 	      (set-window-buffer win quail-guidance-buf)
 	      ;;(set-window-dedicated-p win t)
 	      ))
-	(set-window-buffer win quail-guidance-buf))
+	(set-window-buffer win quail-guidance-buf)
+	(set-minibuffer-window win))
       (setq quail-guidance-win win)))
 
   ;; And, create a buffer for completion.