diff --git a/legacy/edje/src/lib/edje_textblock_styles.c b/legacy/edje/src/lib/edje_textblock_styles.c
index c8c9685f2b..3d7b3f866d 100644
--- a/legacy/edje/src/lib/edje_textblock_styles.c
+++ b/legacy/edje/src/lib/edje_textblock_styles.c
@@ -440,9 +440,14 @@ _edje_textblock_style_parse_and_fix(Edje_File *edf)
 	     /* Add font name last to save evas from multiple loads */
 	     if (tag->font)
 	       {
+		  char *tmp;
 		  buf = _edje_strbuf_append(buf, " ", &buflen, &bufalloc);
 		  buf = _edje_strbuf_append(buf, "font=", &buflen, &bufalloc);
-		  buf = _edje_strbuf_append(buf, tag->font, &buflen, &bufalloc);
+		  tmp = _edje_str_escape(tag->font);
+		  if (tmp) {
+		     buf = _edje_strbuf_append(buf, tmp, &buflen, &bufalloc);
+		     free(tmp);
+		  }
 	       }
 	     buf = _edje_strbuf_append(buf, "'", &buflen, &bufalloc);
 	  }