diff --git a/ChangeLog b/ChangeLog
index 1a50d14e6e..27c321a6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-04  Michael Bouchaud (yoz)
+
+        * fix edje_object_scale_set to be recursive
+
 2013-09-03  Tom Hacohen
 
 	* Evas textblock: fixed an issue with markup_get and markup_to_utf8
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index ac65f54029..ae925c0a05 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -363,7 +363,7 @@ _scale_set(Eo *obj, void *_pd, va_list *list)
    double scale = va_arg(*list, double);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_TRUE;
-   Edje *ed, *ged;
+   Edje *ed;
    Evas_Object *o;
    Eina_List *l;
    unsigned int i;
@@ -371,12 +371,10 @@ _scale_set(Eo *obj, void *_pd, va_list *list)
    ed = _pd;
    if (ed->scale == scale) return;
    ed->scale = FROM_DOUBLE(scale);
-   EINA_LIST_FOREACH(ed->groups, l, ged)
-     ged->scale = ed->scale;
    EINA_LIST_FOREACH(ed->subobjs, l, o)
      {
         const char *s = evas_object_type_get(o);
-        if ((s) && (!strcmp(s, "edje"))) edje_object_calc_force(o);
+        if ((s) && (!strcmp(s, "edje"))) edje_object_scale_set(o, scale);
      }
    for (i = 0; i < ed->table_parts_size; i++)
      {