1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/mouse.el b/lisp/mouse.el
index fb49a2ced32..4ff1b9659e4 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1214,6 +1214,10 @@ and selects that window."
         (let ((beg (point)))
           (skip-chars-forward "^ \t\n")
           (setq choice (buffer-substring beg (point))))))
+    (let ((owindow (selected-window)))
+      (select-window (posn-window (event-start event)))
+      (bury-buffer)
+      (select-window owindow))
     (set-buffer buffer)
     (mouse-delete-max-match choice)
     (insert choice)