diff --git a/src/gui/server/public-api-gemini-stream.lisp b/src/gui/server/public-api-gemini-stream.lisp
index bda3b30..cadbc16 100644
--- a/src/gui/server/public-api-gemini-stream.lisp
+++ b/src/gui/server/public-api-gemini-stream.lisp
@@ -453,18 +453,15 @@
                     (longest-number    (find-longest-string toc-numbers))
                     (max-number-length (length longest-number))
                     (max-non-padded-text-size (+ max-text-length max-number-length))
-                    (toc-entries-text (loop for text in toc-text
-                                            for number in toc-numbers
-                                            collect
-                                            (let* ((text-length  (+ (length text)
-                                                                    (length number)))
-                                                   (padding-size (- max-non-padded-text-size
-                                                                    text-length))
-                                                   (padding (make-string padding-size
-                                                                         :initial-element (swconf:gemini-toc-padding-char))))
-                                              (strcat number
-                                                      padding
-                                                      text)))))
+                    (toc-entries-text
+                     (loop for text in toc-text
+                           for number in toc-numbers
+                           collect
+                           (let* ((prefix (right-padding number
+                                                         max-number-length
+                                                         :padding-char
+                                                         (swconf:gemini-toc-padding-char))))
+                             (strcat prefix text)))))
         (values
          (loop for toc-entry in toc
                for text in toc-entries-text