diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c
index ecc09e9131..99aad4d787 100644
--- a/legacy/elementary/src/lib/elm_list.c
+++ b/legacy/elementary/src/lib/elm_list.c
@@ -1325,14 +1325,16 @@ _item_select(Elm_List_Item *it)
 
    if (it->base.disabled || (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))
      return;
-   if (!sd->focus_on_selection_enabled && (it->icon || it->end))
+   if (!sd->focus_on_selection_enabled)
      {
-        if (elm_object_widget_check(it->icon) && elm_object_focus_get(it->icon))
+        if (it->icon && elm_object_widget_check(it->icon) &&
+            elm_object_focus_get(it->icon))
           {
              elm_object_focus_set(obj, EINA_FALSE);
              elm_object_focus_set(obj, EINA_TRUE);
           }
-        else if (elm_object_widget_check(it->end) && elm_object_focus_get(it->end))
+        else if (it->end && elm_object_widget_check(it->end) &&
+                 elm_object_focus_get(it->end))
           {
              elm_object_focus_set(obj, EINA_FALSE);
              elm_object_focus_set(obj, EINA_TRUE);