diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 89f26507f6b..b14a97bb64b 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -552,7 +552,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
       (error "No%s dynamic expansion for `%s' found"
 	     (if old " further" "") abbrev))
      (t
-      (if (not (eq dabbrev--last-buffer dabbrev--last-buffer-found))
+      (if (not (or (eq dabbrev--last-buffer dabbrev--last-buffer-found)
+		   (minibuffer-window-active-p (selected-window))))
 	  (progn
 	    (message "Expansion found in '%s'"
 		     (buffer-name dabbrev--last-buffer))