diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp
index e7113f7..7f2b464 100644
--- a/src/gui/client/main-window.lisp
+++ b/src/gui/client/main-window.lisp
@@ -337,7 +337,7 @@
                                            :leave-callback
                                            (lambda () (print-info-message "")))
                      (gui:append-line gemtext-widget "")))))
-             (render-line (key text line-number)
+             (render-line (key text line-number &key (wrap :word))
                (let ((font                (key->font key))
                      (justification       (key->justification key))
                      (start-index         `(:line ,line-number :char 0)))
@@ -351,6 +351,7 @@
                                               (gui:make-indices-end))))
                      (gui:tag-configure gemtext-widget
                                         tag
+                                        :wrap       wrap
                                         :font       font
                                         :foreground foreground
                                         :background background
@@ -371,7 +372,10 @@
                   (:as-is
                    (vector-push-extend (ir-line line) ir-rendered-lines)
                    (incf render-line-count)
-                   (render-line :as-is (a:last-elt ir-rendered-lines) render-line-count))
+                   (render-line :as-is
+                                (a:last-elt ir-rendered-lines)
+                                render-line-count
+                                :wrap :none))
                   (:text
                    (vector-push-extend (ir-line line) ir-rendered-lines)
                    (incf render-line-count)
@@ -401,7 +405,10 @@
                    (incf render-line-count)
                    (setf starting-pre-block-line (1+ render-line-count))
                    (setf current-pre-block-alt-text (ir-pre-alt-text line))
-                   (render-line :pre (a:last-elt ir-rendered-lines) render-line-count))
+                   (render-line :pre
+                                (a:last-elt ir-rendered-lines)
+                                render-line-count
+                                :wrap :none))
                   (:pre-end
                    (vector-push-extend (format nil "") ir-rendered-lines)
                    (setf ending-pre-block-line (1+ render-line-count))