diff --git a/ChangeLog b/ChangeLog
index a1ad0c58c2..860053b926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
 2013-02-21  Tom Hacohen (TAsn)
 
         * Evas text: Fixed bug with the text object direction detection.
+        * Evas font: Fixed font run detection for specific cases with 2
+	different fonts in the middle of a run.
 
-	size_range.
 2013-02-21  Carsten Haitzler (The Rasterman)
 
         * Add ecore_x_dnd_self_begin() and ecore_x_dnd_self_drop() to
diff --git a/NEWS b/NEWS
index a9bf4ed1d4..d4f5c06d09 100644
--- a/NEWS
+++ b/NEWS
@@ -178,4 +178,5 @@ Fixes:
     * Properly report file not found in Edje.
     * Fix ecore-x edid fetch to ftech 128, not 100 bytes.
     * Evas text: Fixed bug with the text object direction detection.
+    * Evas font: Fixed font run detection for specific cases with 2 different fonts in the middle of a run.
     
diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index a5dcbcb84b..d3f722174c 100644
--- a/src/lib/evas/common/evas_font_query.c
+++ b/src/lib/evas/common/evas_font_query.c
@@ -79,12 +79,10 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi
                 continue;
              /* Break if either it's not in the font, or if it is in the
               * script's font. */
-             if (fi == *script_fi)
-               {
-                  if (!evas_common_get_char_index(fi, *itr))
-                     break;
-               }
-             else
+             if (!evas_common_get_char_index(fi, *itr))
+                break;
+
+             if (fi != *script_fi)
                {
                   if (evas_common_get_char_index(*script_fi, *itr))
                      break;