1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7053e637865..a0b269678bc 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1149,7 +1149,9 @@ and the meta character is unread so that it applies to editing the string."
              ;; is in isearch mode.  So end the search in that buffer.
              (if (and (listp main-event)
                       (setq window (posn-window (event-start main-event)))
-                      (windowp window))
+                      (windowp window)
+                      (or (> (minibuffer-depth) 0)
+                          (not (window-minibuffer-p window))))
                  (save-excursion
                    (set-buffer (window-buffer window))
                    (isearch-done)