diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f2d78e92c8..7c6ec59aa64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+	* locate.el (locate): Use pop-to-buffer instead of
+	switch-to-buffer-other-window.  (Bug#6204)
+
 2010-05-20  Juri Linkov  <juri@jurta.org>
 
 	* replace.el (replace-highlight): Fix lazy-highlighting
diff --git a/lisp/locate.el b/lisp/locate.el
index d0021dfed22..f1983a3e18a 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -326,7 +326,7 @@ ARG is the interactive prefix arg."
 	(locate-do-setup search-string)
 	))
     (and (not (string-equal (buffer-name) locate-buffer-name))
-	(switch-to-buffer-other-window locate-buffer-name))
+	(pop-to-buffer locate-buffer-name))
 
     (run-hooks 'dired-mode-hook)
     (dired-next-line 3)			;move to first matching file.