diff --git a/web/public/js/components.js b/web/public/js/components.js
index 133996ee..c6b04298 100755
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -12246,9 +12246,10 @@ Vue.component("keyword", {
 	},
 	methods: {
 		encodeHTML: function (s) {
-			s = s.replace("&", "&")
-			s = s.replace("<", "&lt;")
-			s = s.replace(">", "&gt;")
+			s = s.replace(/&/g, "&amp;")
+			s = s.replace(/</g, "&lt;")
+			s = s.replace(/>/g, "&gt;")
+			s = s.replace(/"/g, "&quot;")
 			return s
 		}
 	},
diff --git a/web/public/js/components/common/keyword.js b/web/public/js/components/common/keyword.js
index c19a487d..1a0cef34 100644
--- a/web/public/js/components/common/keyword.js
+++ b/web/public/js/components/common/keyword.js
@@ -25,9 +25,10 @@ Vue.component("keyword", {
 	},
 	methods: {
 		encodeHTML: function (s) {
-			s = s.replace("&", "&amp;")
-			s = s.replace("<", "&lt;")
-			s = s.replace(">", "&gt;")
+			s = s.replace(/&/g, "&amp;")
+			s = s.replace(/</g, "&lt;")
+			s = s.replace(/>/g, "&gt;")
+			s = s.replace(/"/g, "&quot;")
 			return s
 		}
 	},
diff --git a/web/public/js/utils.js b/web/public/js/utils.js
index f96145e7..a01e4f68 100644
--- a/web/public/js/utils.js
+++ b/web/public/js/utils.js
@@ -624,10 +624,10 @@ window.teaweb = {
 		return instance
 	},
 	encodeHTML: function (s) {
-		s = s.replace("&", "&amp;")
-		s = s.replace("<", "&lt;")
-		s = s.replace(">", "&gt;")
-		s = s.replace("\"", "&quot;")
+		s = s.replace(/&/g, "&amp;")
+		s = s.replace(/</g, "&lt;")
+		s = s.replace(/>/g, "&gt;")
+		s = s.replace(/"/, "&quot;")
 		return s
 	}
 }