diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 07dee748ed..10ede30361 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -26,9 +26,18 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { static void _elm_box_efl_ui_focus_composition_prepare(Eo *obj, Elm_Box_Data *pd EINA_UNUSED) { + Eina_List *n, *nn; + Elm_Widget *elem; + Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); Eina_List *order = evas_object_box_children_get(wpd->resize_obj); + EINA_LIST_FOREACH_SAFE(order, n, nn, elem) + { + if (!efl_isa(elem, ELM_WIDGET_CLASS)) + order = eina_list_remove(order, elem); + } + efl_ui_focus_composition_elements_set(obj, order); }