diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index e4c6074882..25e5eaa3c7 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1157,3 +1157,7 @@
 2013-03-15  Jaehwan Kim
 
         * Add the smart signals in scroller. "scroll,left", "scroll,right", "scroll,up", "scroll,down".
+
+2013-03-18  WooHyun Jung
+
+        * Focus highlight should be reconfigured when theme is changed.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 94867f9b12..bb317ca854 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -185,6 +185,7 @@ Fixes:
    * Entry: Fixed a bug with text appending.
    * Fixed a bug in elm_list. Focus_next is needed only when access mode is enabled.
    * Fix a memory leak of elm_genlist - EINA_LIST_FREE should be used for returned value of elm_genlist_realized_items_get
+   * Focus highlight should be reconfigured when theme is changed.
    
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 4bb366f593..73503c7cef 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -707,7 +707,8 @@ _elm_win_focus_highlight_reconfigure(Elm_Win_Smart_Data *sd)
                       sd->focus_highlight.prev.visible);
 
    if ((target == previous) && (!visible_changed) &&
-       (!sd->focus_highlight.geometry_changed))
+       (!sd->focus_highlight.geometry_changed) &&
+       (!sd->focus_highlight.changed_theme))
      return;
 
    if ((previous) && (sd->focus_highlight.prev.handled))