diff --git a/.gitignore b/.gitignore
index e35d885..3edab94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 _build
+dream-html
+odoc.support
diff --git a/lib/dream_html.ml b/lib/dream_html.ml
index e759516..4155a02 100644
--- a/lib/dream_html.ml
+++ b/lib/dream_html.ml
@@ -83,11 +83,37 @@ let set_body resp node =
   Dream.set_header resp "Content-Type" "text/html"
 
 let write stream node = Dream.write stream (to_string node)
-let escape raw = if raw then Fun.id else Dream.html_escape
+
+let txt_escape buffer = function
+  | '&' -> Buffer.add_string buffer "&"
+  | '<' -> Buffer.add_string buffer "&lt;"
+  | '>' -> Buffer.add_string buffer "&gt;"
+  | c -> Buffer.add_char buffer c
+
+let txt_escape raw s =
+  if raw then
+    s
+  else
+    let buffer = Buffer.create (String.length s * 2) in
+    String.iter (txt_escape buffer) s;
+    Buffer.contents buffer
+
+let attr_escape buffer = function
+  | '"' -> Buffer.add_string buffer "&quot;"
+  | c -> Buffer.add_char buffer c
+
+let attr_escape raw s =
+  if raw then
+    s
+  else
+    let buffer = Buffer.create (String.length s * 2) in
+    String.iter (attr_escape buffer) s;
+    Buffer.contents buffer
+
 let attr name = name, ""
 
 let string_attr name ?(raw = false) fmt =
-  Printf.ksprintf (fun s -> name, escape raw s) fmt
+  Printf.ksprintf (fun s -> name, attr_escape raw s) fmt
 
 let uri_attr name fmt =
   Printf.ksprintf (fun s -> name, s |> Uri.of_string |> Uri.to_string) fmt
@@ -100,10 +126,12 @@ let void_tag name attrs = Tag { name; attrs; children = None }
 
 let text_tag name ?(raw = false) attrs fmt =
   Printf.ksprintf
-    (fun s -> Tag { name; attrs; children = Some [Txt (escape raw s)] })
+    (fun s -> Tag { name; attrs; children = Some [Txt (txt_escape raw s)] })
     fmt
 
-let txt ?(raw = false) fmt = Printf.ksprintf (fun s -> Txt (escape raw s)) fmt
+let txt ?(raw = false) fmt =
+  Printf.ksprintf (fun s -> Txt (txt_escape raw s)) fmt
+
 let csrf_tag req = req |> Dream.csrf_tag |> txt ~raw:true "%s"
 let comment str = Comment (Dream.html_escape str)
 
diff --git a/test/dream_html_test.ml b/test/dream_html_test.ml
index e018e79..6cdc99b 100644
--- a/test/dream_html_test.ml
+++ b/test/dream_html_test.ml
@@ -42,14 +42,14 @@ let node =
                   onblur "if (1 > 0) alert(this.value)" ];
               null
                 [ comment "oops --><script>alert('lol')</script>";
-                  dialog [open_] [div [] []];
+                  dialog [open_; title_ {|"hello"|}] [div [] []];
                   template [id "idtmpl"] [p [] [txt "Template"]];
                   div [translate `no] [p [translate `yes] []];
                   textarea
                     [ required;
                       Hx.trigger "keyup[target.value.trim() != '']";
                       autocapitalize `words ]
-                    "super";
+                    "'super'";
                   hr [(if true then class_ "super" else null_)];
                   greet "Bob" ] ] ] ]
 
diff --git a/test/expected.html b/test/expected.html
index f389057..2132829 100644
--- a/test/expected.html
+++ b/test/expected.html
@@ -7,13 +7,13 @@
 <a href="/%F0%9F%98%89">wink</a>
 </article>
 <input type="text" autocomplete="name" onblur="if (1 > 0) alert(this.value)"><!-- oops --&gt;&lt;script&gt;alert(&#x27;lol&#x27;)&lt;/script&gt; -->
-<dialog open><div></div>
+<dialog open title="&quot;hello&quot;"><div></div>
 </dialog>
 <template id="idtmpl"><p>Template</p>
 </template>
 <div translate="no"><p translate="yes"></p>
 </div>
-<textarea required data-hx-trigger="keyup[target.value.trim() != '']" autocapitalize="words">super</textarea>
+<textarea required data-hx-trigger="keyup[target.value.trim() != '']" autocapitalize="words">'super'</textarea>
 <hr class="super"><p id="greet-Bob">Hello, Bob!</p>
 </main>
 </body>