diff --git a/.changeset/template-chooser-card-width.md b/.changeset/template-chooser-card-width.md
new file mode 100644
index 00000000..73cc40e9
--- /dev/null
+++ b/.changeset/template-chooser-card-width.md
@@ -0,0 +1,5 @@
+---
+"@sendlit/email-blocks": patch
+---
+
+`TemplateChooser` keeps template cards the same width in every section. A section with only one or two templates, such as "Your templates", no longer stretches its cards across the whole row.
diff --git a/packages/email-blocks/src/template-chooser.tsx b/packages/email-blocks/src/template-chooser.tsx
index 1e9c0ea8..841c0dfd 100644
--- a/packages/email-blocks/src/template-chooser.tsx
+++ b/packages/email-blocks/src/template-chooser.tsx
@@ -136,7 +136,7 @@ function TemplateGrid({
   previewRenderContext?: unknown;
 }) {
   return (
-    <div className="grid grid-cols-[repeat(auto-fit,minmax(13rem,1fr))] gap-4">
+    <div className="grid grid-cols-[repeat(auto-fill,minmax(13rem,1fr))] gap-4">
       {items.map((item) => (
         <button
           key={item.templateId}