diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index b2cfb0101f..69335b07c0 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -667,4 +667,7 @@
 2012-10-31  Carsten Haitzler (The Rasterman)
 
         * Fix edje_cc to use max compression, not default compression.
-        
+
+2012-10-31  ChunEon Park (Hermet)
+
+        * Fix to update the text classes when text classes are changed.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 04d9c2b864..e81db82a8a 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -26,6 +26,7 @@ Fixes:
     * fix scale_set with edje containing boxes and/or tables
     * fix scale_set with edje containing groups
     * fix edje_cc to use max, not default compression
+    * fix edje_text_class_set to update the text classes correctly.
 
 
 Edje 1.7.0
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index d314e5eb98..a17381754c 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -964,9 +964,8 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
    else
      {
         /* Match and the same, return */
-        if ((tc->size == size) ||
-            (tc->font == font) ||
-            (tc->font && font && !strcmp(tc->font, font)))
+        if (((tc->font && font) && !strcmp(tc->font, font)) &&
+            (tc->size == size))
           return EINA_TRUE;
 
         /* Update the class found */