diff --git a/src/lib/elementary/efl_ui_box_flow.c b/src/lib/elementary/efl_ui_box_flow.c
index 82917f090d..2ad1fd7cdd 100644
--- a/src/lib/elementary/efl_ui_box_flow.c
+++ b/src/lib/elementary/efl_ui_box_flow.c
@@ -193,6 +193,7 @@ _efl_ui_box_flow_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Flow_Data *pd
 
         cross_min_sum += row->cross_space;
         cross_weight_sum += row->cross_weight;
+        item_last += row->item_count;
 
         if (bd->homogeneous)
           continue;
@@ -205,7 +206,6 @@ _efl_ui_box_flow_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Flow_Data *pd
              calc_size = box_size;
              inlist = NULL;
 
-             item_last += row->item_count;
              for (; i < item_last; i++)
                {
                   double denom;
@@ -246,6 +246,7 @@ _efl_ui_box_flow_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Flow_Data *pd
         else if (EINA_DBL_EQ(row->weight_sum, 0))
           {
              row->cur_pos += (box_size - row->min_sum) * box_calc[axis].align;
+             i += row->item_count;
           }
      }