diff --git a/eyebrowse.el b/eyebrowse.el
index d771286..25908c4 100644
--- a/eyebrowse.el
+++ b/eyebrowse.el
@@ -185,6 +185,12 @@ If t, ask for confirmation."
   :type 'boolean
   :group 'eyebrowse)
 
+(defcustom eyebrowse-buffer-list-count 20
+  "How many buffers to keep in the recent list.
+Large numbers slow down switching."
+  :type 'integer
+  :group 'eyebrowse)
+
 (defvar eyebrowse-mode-prefix-map
   (let ((prefix-map (make-sparse-keymap)))
     (define-key prefix-map (kbd "<") 'eyebrowse-prev-window-config)
@@ -358,7 +364,7 @@ If a buffer name equal to OLD is found, it is replaced with NEW."
       (eyebrowse--fixup-window-config window-config)
       (window-state-put window-config (frame-root-window) 'safe)
       (when buffer-list
-        (update-buffer-list buffer-list)))))
+        (update-buffer-list (take eyebrowse-buffer-list-count buffer-list))))))
 
 (defun eyebrowse--string-to-number (x)
   "Version of `string-to-number' that returns nil if not a number."