diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa68d060805..dc633c88ab9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-28  Miles Bader  <miles@gnu.org>
+
+	* wid-edit.el (widget-choose): Make sure pop-up window is large
+	enough to display all the choices, as there's no way to scroll it.
+
 2000-11-28  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule-conf.el: Make the coding system no-conversion
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 6b5c1fbd99f..eb402a95eae 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -254,7 +254,7 @@ minibuffer."
 	   ;; that corresponds to it.
 	   (save-window-excursion
 	     (let ((buf (get-buffer " widget-choose")))
-	       (display-buffer buf)
+	       (fit-window-to-buffer (display-buffer buf))
 	       (let ((cursor-in-echo-area t)
 		     keys
 		     (char 0)