diff --git a/frontend/src/components/ChatSuggestionInputCard.tsx b/frontend/src/components/ChatSuggestionInputCard.tsx
index 6d937b8e..873638a1 100644
--- a/frontend/src/components/ChatSuggestionInputCard.tsx
+++ b/frontend/src/components/ChatSuggestionInputCard.tsx
@@ -23,6 +23,9 @@ export const ChatSuggestionInputCard = ({
       label={texts.common.text}
       placeholder={texts.common.text}
       resize="vertical"
+      autosize
+      minRows={3}
+      maxRows={15}
       {...suggestionProps}
     />
     <ActionIcon
diff --git a/frontend/src/components/ChatSuggestionsInput.tsx b/frontend/src/components/ChatSuggestionsInput.tsx
index b3cd4f52..09e469c8 100644
--- a/frontend/src/components/ChatSuggestionsInput.tsx
+++ b/frontend/src/components/ChatSuggestionsInput.tsx
@@ -35,7 +35,7 @@ export function ChatSuggestionsInput<T extends ChatSuggestionsFormValues>({ form
           {description}
         </Text>
       )}
-      <SimpleGrid cols={2}>
+      <SimpleGrid cols={1}>
         {values.chatSuggestions?.map((_, index) => (
           <ChatSuggestionInputCard
             key={index}
diff --git a/frontend/src/components/Forms.tsx b/frontend/src/components/Forms.tsx
index 066053cf..565cb923 100644
--- a/frontend/src/components/Forms.tsx
+++ b/frontend/src/components/Forms.tsx
@@ -7,6 +7,7 @@ import {
   MultiSelect as MantineMultiSelect,
   Select as MantineSingleSelect,
   TagsInput,
+  Textarea,
 } from '@mantine/core';
 import { IconRefresh } from '@tabler/icons-react';
 import { HTMLProps, PropsWithChildren, ReactNode, useEffect, useState } from 'react';
@@ -551,8 +552,11 @@ const InputTextarea = ({ className, name, ...other }: FormEditorProps<string>) =
   const { field, fieldState, formState } = useController({ name });
 
   return (
-    <textarea
+    <Textarea
       id={name}
+      autosize
+      maxRows={15}
+      minRows={3}
       {...field}
       {...other}
       className={cn('textarea textarea-bordered w-full', className, {
diff --git a/frontend/src/pages/admin/extensions/UpsertConfigurationDialog.tsx b/frontend/src/pages/admin/extensions/UpsertConfigurationDialog.tsx
index fe59124f..15e217f8 100644
--- a/frontend/src/pages/admin/extensions/UpsertConfigurationDialog.tsx
+++ b/frontend/src/pages/admin/extensions/UpsertConfigurationDialog.tsx
@@ -113,7 +113,7 @@ export function UpsertConfigurationDialog(props: UpsertConfigurationDialogProps)
             />
             <ChatSuggestionsInput form={form} description={texts.theme.suggestionsHints(MAX_SUGGESTIONS)} />
           </fieldset>
-          <Flex gap="sm" justify={'end'}>
+          <Flex gap="sm" pt="sm" justify={'end'}>
             <Button onClick={onClose} variant="subtle">
               {texts.common.cancel}
             </Button>