diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 4b65214eac..ce8f607e84 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -374,7 +374,7 @@ _edje_part_recalc_single(Edje *ed,
 	       _edje_text_styles[ep->part->effect].pad.l +
 	       _edje_text_styles[ep->part->effect].pad.r;
 	     if (chosen_desc->text.min_y)
-	       minw = th + 
+	       minh = th + 
 	       _edje_text_styles[ep->part->effect].pad.t +
 	       _edje_text_styles[ep->part->effect].pad.b;
 	  }
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 3ca6276f34..4d8ec1f3f7 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -279,7 +279,8 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
    if (!obj_swallow) return;
    rp->swallowed_object = obj_swallow;
    evas_object_smart_member_add(rp->swallowed_object, ed->obj);
-   evas_object_clip_set(rp->swallowed_object, ed->clipper);
+   if (rp->clip_to) evas_object_clip_set(rp->object, rp->clip_to->object);
+   else evas_object_clip_set(rp->swallowed_object, ed->clipper);
    if (evas_object_layer_get(rp->swallowed_object) != ed->layer)
      evas_object_layer_set(rp->swallowed_object, ed->layer);
    evas_object_stack_above(rp->swallowed_object, rp->object);