diff --git a/src/back/routes/common/show-first-row/show-first-row.css b/src/back/routes/common/show-first-row/show-first-row.css
index d82206c..3f35bc6 100644
--- a/src/back/routes/common/show-first-row/show-first-row.css
+++ b/src/back/routes/common/show-first-row/show-first-row.css
@@ -10,10 +10,14 @@
 		transition: row-gap 200ms, overflow 200ms;
 		overflow: hidden;
 
-		input:not(:checked) + & {
-			grid-template-rows: 1fr repeat(calc(var(--items-count) - 1), 0px);
+		.show-first-row__checkbox:not(:checked) + & {
 			row-gap: 0;
 		}
+
+		& > * {
+			align-self: center;
+			justify-self: center;
+		}
 	}
 
 	.show-first-row__default-button {
diff --git a/src/back/routes/common/show-first-row/show-first-row.tsx b/src/back/routes/common/show-first-row/show-first-row.tsx
index 5c4dbb4..253f0a7 100644
--- a/src/back/routes/common/show-first-row/show-first-row.tsx
+++ b/src/back/routes/common/show-first-row/show-first-row.tsx
@@ -11,10 +11,15 @@ const showFirstRowIds = (function* () {
 	}
 })();
 
+function min_container_width(columns: number, column_width: number, gap: number) {
+	return columns * column_width + (columns - 1) * gap;
+}
+
 export async function showFirstRow({
 	items,
 	min_column_width_px = 250,
 	column_gap_px = 10,
+	row_gap_px = column_gap_px,
 	make_show_more_button = () => (
 		<span class="show-first-row__default-button">Show more</span>
 	),
@@ -29,18 +34,21 @@ export async function showFirstRow({
 		</>
 	),
 	classes = [],
+	how_many_rows = () => 1,
 }: {
 	items: FlatTemplatable[];
 	min_column_width_px?: number;
 	make_show_more_button?: () => JSX.Element;
 	make_show_less_button?: () => JSX.Element;
 	column_gap_px?: number;
+	row_gap_px?: number;
 	add_button_to_content?: (
 		content: JSX.Element,
 		show_more_button: JSX.Element,
 		show_less_button: JSX.Element
 	) => JSX.Element;
 	classes?: classNames.ArgumentArray;
+	how_many_rows?: (columns_count: number) => number;
 }): Promise<string> {
 	const id = showFirstRowIds.next().value;
 	const checkbox_id = "show-first-row__checkbox--" + id;
@@ -54,24 +62,58 @@ export async function showFirstRow({
 			]}
 			style={`--min-column-width: ${min_column_width_px}px; --items-count: ${items.length}; --column-gap: ${column_gap_px}px`}
 		>
-			{
-				/* HTML */ `<style>
-					${[1, 2, 3, 4, 5, 6, 7, 8, 9]
-						.reverse()
-						.map(
-							(n) => `@container (min-width: ${
-								n * min_column_width_px + (n - 1) * column_gap_px
-							}px) {
-							.show-first-row--id-${id}:not(:has(.show-first-row__items > *:nth-child(${n + 1})))
-							.show-first-row__button {
-							display: none;
+			{[1, 2, 3, 4, 5, 6, 7, 8, 9]
+				.reverse()
+				.map((columns) => {
+					const rows = how_many_rows(columns);
+					return /* HTML */ `<style>
+						@container (min-width: ${min_container_width(
+							columns,
+							min_column_width_px,
+							column_gap_px
+						) + 1}px) and  (max-width: ${min_container_width(
+							columns + 1,
+							min_column_width_px,
+							column_gap_px
+						)}px) {
+							.show-first-row--id-${id} {
+								&:not(
+										:has(
+												.show-first-row__items
+													> *:nth-child(${columns * rows + 1})
+											)
+									) {
+									.show-first-row__button {
+										display: none;
+									}
+								}
+
+								.show-first-row__checkbox:not(:checked)
+									+ .show-first-row__items {
+									grid-template-rows: ${"auto ".repeat(rows)} repeat(
+											calc(var(--items-count) - ${rows}),
+											0px
+										);
+
+									& > * {
+										margin-bottom: ${row_gap_px}px !important;
+										&:nth-child(n + ${columns * rows + 1}) {
+											opacity: 0;
+											pointer-events: none;
+										}
+									}
+								}
+							}
 						}
-					}`
-						)
-						.join("\n")}
-				</style>`
-			}
-			<input type="checkbox" id={checkbox_id} style="display: none" />
+					</style>`;
+				})
+				.join("\n")}
+			<input
+				class="show-first-row__checkbox"
+				type="checkbox"
+				id={checkbox_id}
+				style="display: none"
+			/>
 			{add_button_to_content(
 				<div class={["show-first-row__items"]}>{items}</div>,
 				<label
diff --git a/src/back/routes/demos/show-first-row.page.tsx b/src/back/routes/demos/show-first-row.page.tsx
index aeb92f8..481fc6e 100644
--- a/src/back/routes/demos/show-first-row.page.tsx
+++ b/src/back/routes/demos/show-first-row.page.tsx
@@ -9,7 +9,7 @@ export const actionName = "ShowFirstRowDemo";
 function makeBoxStyle() {
 	return `width: 100%; max-width: 200px; height: ${
 		100 + Math.random() * 100
-	}px; margin: auto; background-color: lime; text-align: center;  color: #0000009e;  font-size: 40px;  padding-top: 20px;  box-sizing: border-box;`;
+	}px; background-color: lime; text-align: center;  color: #0000009e;  font-size: 40px;  padding-top: 20px;  box-sizing: border-box;`;
 }
 
 export default new (class ShowFirstRowDemoPage extends Page {
@@ -30,10 +30,30 @@ export default new (class ShowFirstRowDemoPage extends Page {
 						<div style={makeBoxStyle()}>{e}</div>
 					)),
 				})}
+
 				<h2> 3 elements (overflow depends on screen width)</h2>
 				{showFirstRow({
 					items: [1, 2, 3].map((e) => <div style={makeBoxStyle()}>{e}</div>),
 				})}
+
+				<h2> 9 elements (always has two rows when collapsed)</h2>
+				{showFirstRow({
+					items: [1, 2, 3, 4, 5, 6, 7, 8, 9].map((e) => (
+						<div style={makeBoxStyle()}>{e}</div>
+					)),
+					how_many_rows: () => 2,
+				})}
+
+				<h2>
+					9 elements (4 rows in one column mode, two rows in two column mode,
+					one row otherwise)
+				</h2>
+				{showFirstRow({
+					items: [1, 2, 3, 4, 5, 6, 7, 8, 9].map((e) => (
+						<div style={makeBoxStyle()}>{e}</div>
+					)),
+					how_many_rows: (columns) => (columns == 1 ? 4 : columns == 2 ? 2 : 1),
+				})}
 			</div>
 		);
 	}