diff --git a/buffer-sets.el b/buffer-sets.el
index 28102f06e71f8665cd34ce58610e639fc2a947c1..753646767a0313b0656f30d78e14b995c99db378 100644
--- a/buffer-sets.el
+++ b/buffer-sets.el
@@ -168,8 +168,14 @@
         (dolist (buffer (symbol-value (buffer-set--generate-buffers-list set)))
           (if (buffer-live-p buffer)
               (if (null (get-buffer-window-list buffer nil t))
-                  (insert (format "    - %s\n" (buffer-name buffer)))
-                (insert (format "    - %s (visible)\n" (buffer-name buffer))))
+                  (progn
+                    (insert "    - ")
+                    (insert-text-button (buffer-name buffer) 'action (eval `(lambda (but) (switch-to-buffer ,buffer))))
+                    (insert "\n"))
+                (progn
+                  (insert "    - ")
+                  (insert-text-button (buffer-name buffer) 'action (eval `(lambda (but) (switch-to-buffer ,buffer))))
+                  (insert "    - %s (visible)\n")))
             ""))))))
 
 ;;;###autoload