diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b7987e4433..0c3172cddc1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-03-08  Gerd Moellmann  <gerd@gnu.org>
 
+	* simple.el (choose-completion-string): When not leaving the
+	minibuffer, raise the minibuffer frame when minibuffer-auto-raise
+	is set.
+
 	* window.el (shrink-window-if-larger-than-buffer): Handle frame
 	parameter `(minibuffer . t)'.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 510c07e8ddc..0e458e6a105 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3696,7 +3696,10 @@ With prefix argument N, move N items (negative N means move backward)."
 	   ;; is a directory, don't exit the minibuffer.
 	   (if (and (eq minibuffer-completion-table 'read-file-name-internal)
 		    (file-directory-p (field-string (point-max))))
-	       (select-window (active-minibuffer-window))
+	       (let ((mini (active-minibuffer-window)))
+		 (select-window mini)
+		 (when minibuffer-auto-raise
+		   (raise-frame (window-frame mini))))
 	     (exit-minibuffer))))))
 
 (defun completion-list-mode ()