diff --git a/druid/extended/layout.lua b/druid/extended/layout.lua
index dea876b..738630c 100644
--- a/druid/extended/layout.lua
+++ b/druid/extended/layout.lua
@@ -232,13 +232,14 @@ function M.refresh_layout(self)
 
 				-- Compare with eps due the float loss and element flickering
 				if current_x + node_width - new_row_width > 0.0001 then
+					current_y = current_y - row.height - margin.y
+
 					if row_index < #rows then
 						row_index = row_index + 1
 						row = rows[row_index]
 					end
 
 					current_x = -row.width * (0.5 + layout_pivot_offset.x)
-					current_y = current_y - row.height - margin.y
 					if is_justify and row.count > 1 then
 						current_x = -max_width * (0.5 + layout_pivot_offset.x)
 					end