diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index b042d09ac0..ef648ab65e 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -266,3 +266,7 @@
 2012-01-05  Cedric Bail
 
 	* Reduce call to stat during edje_object_file_set.
+
+2012-01-06  Cedric Bail
+
+	* Unswallow object that are about to be swallowed if necessary.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 40f14ccfc8..c73e711a40 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -11,6 +11,7 @@ Improvements:
     * speedup load time of Edje file.
     * check existence of group at compile time also.
     * reduce number of call to stat during edje_object_file_set.
+    * unswallow object about to be swallowed if necessary.
 
 Changes since Edje 1.0.0:
 -------------------------
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 6e0da6a9cf..0e2aa8f461 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -1908,6 +1908,13 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
    // XXX: by Sachiel, January 21th 2009, 19:30 UTC
    _edje_recalc_do(ed);
 
+   rp = evas_object_data_get(obj_swallow, "\377 edje.swallowing_part");
+   if (rp)
+     {
+        /* The object is already swallowed somewhere, unswallow it first */
+        edje_object_part_unswallow(rp->edje->obj, obj_swallow);
+     }
+
    rp = _edje_real_part_recursive_get(ed, (char *)part);
    if (!rp) return EINA_FALSE;
    if (rp->part->type != EDJE_PART_TYPE_SWALLOW)