diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index a9b1d5397b..9414202239 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1255,7 +1255,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
    if (top && efl_isa(top, EFL_UI_WIN_CLASS))
      top_is_win = EINA_TRUE;
 
-   if (elm_widget_focus_get(obj) && sd->editable)
+   if (efl_ui_focus_object_focus_get(obj) && sd->editable)
      {
         evas_object_focus_set(sd->entry_edje, EINA_TRUE);
         edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index cc872e0c16..13b073b45e 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5434,9 +5434,10 @@ EOLIAN static void
 _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus)
 {
    pd->focused = focus;
-   elm_obj_widget_on_focus_update(obj, NULL);
 
    efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
+
+   elm_obj_widget_on_focus_update(obj, NULL);
 }
 
 EOLIAN static Efl_Ui_Focus_Manager*