diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 40ff9316ae..b424df7e81 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1536,8 +1536,9 @@
 
 2013-08-09  Cedric Bail
 
-        * Add support for URL in Elm_Image with the following new smart callback :
-	"download,start", "download,progress", "download,done", "download,error".
+        * Add support for URL in Elm_Image with the following new smart
+        callback : "download,start", "download,progress", "download,done",
+        "download,error".
 
 2013-08-10  ChunEon Park (Hermet)
 
@@ -1550,4 +1551,10 @@
 
 2013-08-12  Cedric Bail
 
-	* Add URL support to Elm_Photocam with the same callback as URL suport in Elm_Image.
+        * Add URL support to Elm_Photocam with the same callback as URL suport
+        in Elm_Image.
+
+2013-08-12  ChunEon Park (Hermet)
+
+        * Mapbuf: Ensure that content size calculation is correctly finished
+        because the mapbuf is willing to block the size calculation forcely.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 7cb6a297d1..7a956701cb 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -281,6 +281,7 @@ Removals:
    * Naviframe: Dont' be popped if the event is freezed and popping is going on.
    * Ctxpopup: Apply current ctxpopup style to the list.
    * Popup: Fix the corrupted internal widget tree that caused elm_theme_set() doesn't work correctly.
+   * Mapbuf: Ensure that content size calculation is correctly finished because the mapbuf is willing to block the size calculation forcely.
 
 Changes since Elementary 1.0.0:
 -------------------------
diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c
index ba9f75bb29..9f4b1e4269 100644
--- a/legacy/elementary/src/lib/elm_mapbuf.c
+++ b/legacy/elementary/src/lib/elm_mapbuf.c
@@ -51,6 +51,7 @@ _changed_size_hints_cb(void *data,
                        Evas_Object *obj __UNUSED__,
                        void *event_info __UNUSED__)
 {
+   evas_smart_objects_calculate(e);
    _sizing_eval(data);
 }
 
@@ -74,6 +75,10 @@ _elm_mapbuf_smart_sub_object_del(Eo *obj, void *_pd, va_list *list)
         evas_object_event_callback_del_full
           (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb,
           obj);
+        evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_MOVE,
+                                            _changed_size_hints_cb, obj);
+        evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_RESIZE,
+                                            _changed_size_hints_cb, obj);
         sd->content = NULL;
         _sizing_eval(obj);
      }
@@ -281,6 +286,10 @@ _elm_mapbuf_smart_content_set(Eo *obj, void *_pd, va_list *list)
         evas_object_event_callback_add
           (content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
           _changed_size_hints_cb, obj);
+        evas_object_event_callback_add(content, EVAS_CALLBACK_MOVE,
+                                       _changed_size_hints_cb, obj);
+        evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
+                                       _changed_size_hints_cb, obj);
      }
    else
      evas_object_color_set(wd->resize_obj, 0, 0, 0, 0);