diff --git a/src/main.rs b/src/main.rs
index 7309df9..04814c5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -700,7 +700,13 @@ fn handle_relative_connection(
     let _ = stream.write_all(html.into_string().as_bytes());
 
     for Comment { name, text } in &info.comments {
-        let _ = writeln!(stream, "<fieldset><legend>{name}</legend>{text}</fieldset>");
+        let html = html! {
+            fieldset {
+                legend { (name) }
+                (maud::PreEscaped(text))
+            }
+        };
+        let _ = stream.write_all(html.into_string().as_bytes());
     }
 
     section(&mut stream);