diff --git a/packages/xml-builder/src/XmlText.spec.ts b/packages/xml-builder/src/XmlText.spec.ts
index 2cc642d8ecd8..ecae4fce634c 100644
--- a/packages/xml-builder/src/XmlText.spec.ts
+++ b/packages/xml-builder/src/XmlText.spec.ts
@@ -3,6 +3,6 @@ import { XmlText } from "./XmlText";
 describe("XmlText", () => {
   it("escapes element text", () => {
     const text = new XmlText('this & that are < or > "most"');
-    expect(text.toString()).toBe('this &amp; that are &lt; or &gt; "most"');
+    expect(text.toString()).toBe("this &amp; that are &lt; or &gt; &quot;most&quot;");
   });
 });
diff --git a/packages/xml-builder/src/escape-element.spec.ts b/packages/xml-builder/src/escape-element.spec.ts
index 4a1037b618c4..5f660dfb6daf 100644
--- a/packages/xml-builder/src/escape-element.spec.ts
+++ b/packages/xml-builder/src/escape-element.spec.ts
@@ -1,8 +1,8 @@
 import { escapeElement } from "./escape-element";
 
 describe("escape-element", () => {
-  it("escapes: & < >", () => {
-    const value = 'abc 123 &<>"%';
-    expect(escapeElement(value)).toBe('abc 123 &amp;&lt;&gt;"%');
+  it("escapes: & < > \" ' \\n \\r \\u0085 \\u2028", () => {
+    const value = "abc 123 &<>\"'%\n\r\u0085\u2028";
+    expect(escapeElement(value)).toBe("abc 123 &amp;&lt;&gt;&quot;&apos;%&#x0A;&#x0D;&#x85;&#x2028;");
   });
 });
diff --git a/packages/xml-builder/src/escape-element.ts b/packages/xml-builder/src/escape-element.ts
index 564564de664e..68355b74303a 100644
--- a/packages/xml-builder/src/escape-element.ts
+++ b/packages/xml-builder/src/escape-element.ts
@@ -2,5 +2,14 @@
  * Escapes characters that can not be in an XML element.
  */
 export function escapeElement(value: string): string {
-  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/\r/g, "&#x0D;")
+    .replace(/\n/g, "&#x0A;")
+    .replace(/\u0085/g, "&#x85;")
+    .replace(/\u2028/, "&#x2028;");
 }