diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index dae9b59ae0..d4c095e3f2 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -182,26 +182,27 @@ _edje_smart_move(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
              Edje_Real_Part *ep;
 
              ep = ed->table_parts[i];
-             if ((ep->type == EDJE_RP_TYPE_TEXT) &&
-                 (ep->typedata.text))
-               evas_object_move(ep->object, 
-                                ed->x + ep->x + ep->typedata.text->offset.x, 
-                                ed->y + ep->y + ep->typedata.text->offset.y);
+             if ((ep->type == EDJE_RP_TYPE_TEXT) && (ep->typedata.text))
+               {
+                  evas_object_move(ep->object,
+                                   ed->x + ep->x + ep->typedata.text->offset.x,
+                                   ed->y + ep->y + ep->typedata.text->offset.y);
+               }
              else
-               evas_object_move(ep->object, 
-                                ed->x + ep->x, 
-                                ed->y + ep->y);
+               {
+                  evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y);
+                  if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
+                      (ep->typedata.swallow))
+                    {
+                       if (ep->typedata.swallow->swallowed_object)
+                         evas_object_move
+                            (ep->typedata.swallow->swallowed_object,
+                             ed->x + ep->x,
+                             ed->y + ep->y);
+                    }
+               }
              if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
                _edje_entry_real_part_configure(ed, ep);
-             if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
-                 (ep->typedata.swallow))
-               {
-                  if (ep->typedata.swallow->swallowed_object)
-                    evas_object_move
-                    (ep->typedata.swallow->swallowed_object, 
-                        ed->x + ep->x, 
-                        ed->y + ep->y);
-               }
           }
      }
 //   _edje_emit(ed, "move", NULL);