diff --git a/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx b/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx
index 8c142822..57cedef8 100644
--- a/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx
@@ -40,7 +40,7 @@ export function SelectWordForm({ value, onChange, className, ...restProps }: Sel
   }
 
   return (
-    <div className={clsx('text-xs sm:text-sm', className)} {...restProps}>
+    <div className={clsx('text-xs sm:text-sm grid grid-cols-6', className)} {...restProps}>
       {DefaultWordForms.slice(0, 12).map((data, index) => (
         <WordformButton
           key={`${prefixes.wordform_list}${index}`}
diff --git a/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx b/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx
index 23191cd9..4b98d3ba 100644
--- a/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx
@@ -17,7 +17,7 @@ export function WordformButton({ text, example, grams, onSelectGrams, isSelected
       tabIndex={-1}
       onClick={() => onSelectGrams([...grams])}
       className={clsx(
-        'min-w-[4.15rem] sm:min-w-[6.15rem]',
+        'min-w-[3.75rem] sm:min-w-[5.5rem]',
         'p-1',
         'border rounded-none',
         'cursor-pointer',