1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 4739a1121e..b61e7d0c68 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -169,7 +169,9 @@ _evas_object_text_item_del(Evas_Object_Text *o, Evas_Object_Text_Item *it)
    else if (o->last_computed.ellipsis_end == it)
      o->last_computed.ellipsis_end = NULL;
 
-   if (EINA_INLIST_GET(it)->last)
+   if ((EINA_INLIST_GET(it)->next) ||
+       (EINA_INLIST_GET(it)->prev) ||
+       (o->items == (EINA_INLIST_GET(it))))
      o->items = (Evas_Object_Text_Item *)eina_inlist_remove
      (EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
    _evas_object_text_item_clean(it);