diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 2d2d1ece03..49535eb0bb 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -7487,7 +7487,7 @@ _elm_genlist_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Ge
      {
         *y = oy;
      }
-   else if (item_y > (oy + oh - item_h))
+   if (item_y > (oy + oh - item_h))
      {
         *y = oy + oh - item_h;
      }
@@ -7496,6 +7496,10 @@ _elm_genlist_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Ge
      {
         *w = item_w - (item_w - ow);
      }
+   if (item_x < ox)
+     {
+        *x = ox;
+     }
 }
 
 EOLIAN static Elm_Object_Item *