2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/proced.el b/lisp/proced.el
index ce379a7c6aa..b05046bfbd3 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1744,9 +1744,10 @@ The value returned is the value of the last form in BODY."
        (save-window-excursion
          ;; Analogous to `dired-pop-to-buffer'
          ;; Don't split window horizontally.  (Bug#1806)
-         (let (split-width-threshold)
-           (pop-to-buffer (current-buffer)))
-         (fit-window-to-buffer (get-buffer-window) nil 1)
+         (display-buffer (current-buffer)
+                         '(display-buffer-in-direction
+                           (direction . bottom)
+                           (window-height . fit-window-to-buffer)))
          ,@body))))
 
 (defun proced-send-signal (&optional signal process-alist)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b9f98cdc4c7..382eeb8925d 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -252,7 +252,10 @@ minibuffer."
            (define-key map [?\M--] 'negative-argument)
            (save-window-excursion
              (let ((buf (get-buffer " widget-choose")))
-               (fit-window-to-buffer (display-buffer buf))
+               (display-buffer buf
+                               '(display-buffer-in-direction
+                                 (direction . bottom)
+                                 (window-height . fit-window-to-buffer)))
                (let ((cursor-in-echo-area t)
                      (arg 1))
                  (while (not value)