diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index 38242e8e..425760b6 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -806,9 +806,9 @@ true, do *not* update the query history stack."
       (setq list-buffers-directory rewritten-expr)
       (mu4e--modeline-update))
 
-    ;; when the buffer is already visible on the frame, select it; otherwise,
+    ;; when the buffer is already visible, select it; otherwise,
     ;; switch to it.
-    (unless (get-buffer-window buf)
+    (unless (get-buffer-window buf 0)
       (mu4e-display-buffer buf t))
     (run-hook-with-args 'mu4e-search-hook expr)
     (mu4e~headers-clear mu4e~search-message)