diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 0d60ef0af7..ec600cc149 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -509,4 +509,7 @@
           - elm_win_floating_mode_set
           - elm_win_floating_mode_get
 
+2012-09-14  Shinwoo Kim (kimcinoo)
+
+	* Fix info field set for bubble widget.
 
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index fea60820c8..2c5124f3e5 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -27,6 +27,7 @@ Fixes:
    * Fix popup to apply the same style to the notify sub-widget.
    * Fix Ctxpopup direction if unknown priority used.
    * Fix diskselector when bounce off and round enabled.
+   * Fix bubble info field set.
    
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c
index 1ad4b6b7a7..7724cafe33 100644
--- a/legacy/elementary/src/lib/elm_bubble.c
+++ b/legacy/elementary/src/lib/elm_bubble.c
@@ -106,6 +106,9 @@ _elm_bubble_smart_text_set(Evas_Object *obj,
                            const char *item,
                            const char *label)
 {
+   if (!_elm_bubble_parent_sc->text_set(obj, item, label))
+     return EINA_FALSE;
+
    if (item && (!strcmp(item, "info") || !strcmp(item, "elm.info")))
      {
         if (label)
@@ -113,8 +116,6 @@ _elm_bubble_smart_text_set(Evas_Object *obj,
         else
           elm_layout_signal_emit(obj, "elm,state,info,hidden", "elm");
      }
-   else if (!_elm_bubble_parent_sc->text_set(obj, item, label))
-     return EINA_FALSE;
 
    elm_layout_sizing_eval(obj);