diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index cb251552f5..0aa110525e 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1510,3 +1510,7 @@
         the imf is available, the keyboard mode should be decided by ime, but
         not entry. This prevents the asynchronous states between ime and
         conformant.
+
+2013-07-17  ChunEon Park (Hermet)
+
+        * Layout : Send visible/hidden signals whenever contents are set/unset (not only icon and end parts)
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 4624a5b1cd..44e6b8277e 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -296,6 +296,7 @@ Additions:
    * Elm_Win_Trap and elm_win_trap_set() to allow e17 integration.
    * elm_flip_go_to()
    * On focus loss, Elm_Spinner properly hide Elm_Entry and display label properly.
+   * Layout : Send visible/hidden signals whenever contents are set/unset (not only icon and end parts)
 
 Fixes:
 
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index a8d7417804..071e71bc7e 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -132,10 +132,7 @@ _icon_signal_emit(Elm_Layout_Smart_Data *sd,
    char buf[1024];
    const char *type;
 
-   if (sub_d->type != SWALLOW ||
-       (strcmp("elm.swallow.icon", sub_d->part) &&
-        (strcmp("elm.swallow.end", sub_d->part))))
-     return;
+   if (sub_d->type != SWALLOW) return;
 
    if (strncmp(sub_d->part, "elm.swallow.", sizeof("elm.swallow.") - 1) == 0)
      type = sub_d->part + sizeof("elm.swallow.") - 1;
@@ -160,8 +157,7 @@ _text_signal_emit(Elm_Layout_Smart_Data *sd,
    char buf[1024];
    const char *type;
 
-   if (sub_d->type != TEXT || strcmp("elm.text", sub_d->part))
-     return;
+   if (sub_d->type != TEXT) return;
 
    Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd->obj, ELM_OBJ_WIDGET_CLASS);