diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c
index 0a46b9af88..8c6bd801a8 100644
--- a/legacy/elementary/src/lib/elc_naviframe.c
+++ b/legacy/elementary/src/lib/elc_naviframe.c
@@ -233,6 +233,13 @@ _access_focus_set(Elm_Naviframe_Item *it)
      elm_object_focus_set(it->title_icon, EINA_TRUE);
 }
 
+static void
+_item_signals_emit(Elm_Naviframe_Item *it)
+{
+   _item_text_signals_emit(it);
+   _item_content_signals_emit(it);
+}
+
 /* FIXME: we need to handle the case when this function is called
  * during a transition */
 static void
@@ -257,9 +264,6 @@ _item_style_set(Elm_Naviframe_Item *it,
    elm_widget_theme_object_set
      (WIDGET(it), VIEW(it), "naviframe", buf, elm_widget_style_get(WIDGET(it)));
 
-   _item_text_signals_emit(it);
-   _item_content_signals_emit(it);
-
    if (sd->freeze_events)
      evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
 }
@@ -293,6 +297,7 @@ _elm_naviframe_smart_theme(Eo *obj, void *_pd, va_list *list)
    EINA_INLIST_FOREACH(sd->stack, it)
      {
         _item_style_set(it, it->style);
+        _item_signals_emit(it);
         _item_title_visible_update(it);
      }
 
@@ -1829,6 +1834,7 @@ elm_naviframe_item_style_set(Elm_Object_Item *it,
      if (!strcmp("basic", nit->style)) return;
 
    _item_style_set(nit, item_style);
+   _item_signals_emit(nit);
    _item_title_visible_update(nit);
 }