diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 3dc79f04cf..3ad64c7e0c 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -957,3 +957,7 @@
 2012-08-13  Carsten Haitzler (The Rasterman)
 
 	* Fix async fd stuff to generate new pipe after a fork (pid mismatch)
+
+2012-08-14  Tom Hacohen (TAsn)
+
+	* Textblock: Fixed range geometry when the last item is a format.
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 0426bf367b..4428257a02 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -8928,8 +8928,16 @@ _evas_textblock_cursor_range_in_line_geometry_get(
           }
         else
           {
-             x = 0;
-             w = it2->w;
+             if (end > 0)
+               {
+                  x = it2->adv;
+                  w = 0;
+               }
+             else
+               {
+                  x = 0;
+                  w = it2->adv;
+               }
              _evas_textblock_range_calc_x_w(it2, &x, &w, EINA_FALSE,
                         switch_items);
           }