diff --git a/packages/frontend/components/prompts/PromptVariableEditor.tsx b/packages/frontend/components/prompts/PromptVariableEditor.tsx
index 24a718888..8c44acbca 100644
--- a/packages/frontend/components/prompts/PromptVariableEditor.tsx
+++ b/packages/frontend/components/prompts/PromptVariableEditor.tsx
@@ -1,23 +1,17 @@
-import {
-  Badge,
-  Box,
-  Group,
-  Stack,
-  Text,
-  Textarea,
-  Tooltip,
-} from "@mantine/core"
+import { Badge, Box, Group, Stack, Text, Tooltip } from "@mantine/core"
 import { IconInfoCircle } from "@tabler/icons-react"
 import { TemplateVariables } from "shared"
+import VariableTextarea from "./VariableTextarea"
 
 export default function PromptVariableEditor({
-  value = {},
+  value: templateVariables = {},
   onChange,
 }: {
   value: TemplateVariables
   onChange: (value: TemplateVariables) => void
 }) {
-  const hasVariables = Object.keys(value).length > 0
+  const hasVariables = Object.keys(templateVariables).length > 0
+
   return (
     <Box>
       <Group mb="md" align="center" justify="space-between">
@@ -35,40 +29,39 @@ export default function PromptVariableEditor({
         </Text>
       )}
       <Stack mt="sm">
-        {Object.keys(value)
-          .sort()
-          .map((variable) => (
+        {Object.entries(templateVariables)
+          .sort(([nameA], [nameB]) => nameA.localeCompare(nameB))
+          .map(([name, value]) => (
             <Group
-              key={variable}
+              key={name}
               align="center"
               wrap="nowrap"
               justify="space-between"
               gap="lg"
             >
               <Badge
-                key={variable}
-                miw={30}
-                maw="34%"
-                miw={70}
-                px={0}
+                key={name}
+                miw={50}
+                maw={90}
+                px="sm"
                 variant="outline"
                 tt="none"
               >
-                {variable}
+                {name}
               </Badge>
-              <Textarea
+              <VariableTextarea
                 size="xs"
                 w="100%"
                 required={true}
                 radius="sm"
                 rows={1}
-                autosize
-                maxRows={4}
-                defaultValue={value[variable]}
+                maxRows={1}
+                name={name}
+                value={value}
                 onChange={(e) =>
                   onChange({
-                    ...value,
-                    [variable]: e.currentTarget.value,
+                    ...templateVariables,
+                    [name]: e.currentTarget.value,
                   })
                 }
               />
diff --git a/packages/frontend/components/prompts/VariableTextarea.tsx b/packages/frontend/components/prompts/VariableTextarea.tsx
new file mode 100644
index 000000000..0042e5a34
--- /dev/null
+++ b/packages/frontend/components/prompts/VariableTextarea.tsx
@@ -0,0 +1,73 @@
+import {
+  ActionIcon,
+  Box,
+  Button,
+  Modal,
+  Text,
+  Textarea,
+  TextareaProps,
+  Title,
+} from "@mantine/core"
+import { useDisclosure } from "@mantine/hooks"
+import { IconArrowsMaximize } from "@tabler/icons-react"
+
+type VariableTextareaProps = TextareaProps & {
+  name: string
+  value: string
+}
+
+export default function VariableTextarea({
+  name,
+  value,
+  onChange,
+  ...props
+}: VariableTextareaProps) {
+  const [opened, { open, close }] = useDisclosure(false)
+
+  return (
+    <>
+      <Modal
+        opened={opened}
+        onClose={close}
+        title={<Title order={3}>Edit variable</Title>}
+        overlayProps={{
+          backgroundOpacity: 0.55,
+          blur: 3,
+        }}
+        size="xl"
+      >
+        <Textarea
+          size="md"
+          radius="sm"
+          minRows={2}
+          rows={10}
+          autosize
+          value={value}
+          onChange={onChange}
+        />
+
+        <Button my="md" style={{ float: "right" }} onClick={close}>
+          Save
+        </Button>
+      </Modal>
+
+      <Box style={{ position: "relative" }}>
+        <Textarea {...props} onChange={onChange} value={value} />
+        <ActionIcon
+          size="xs"
+          onClick={open}
+          aria-label="expand textarea"
+          variant="transparent"
+          style={{
+            position: "absolute",
+            right: "5%",
+            bottom: "5%",
+            marginBottom: "0.3rem",
+          }}
+        >
+          <IconArrowsMaximize />
+        </ActionIcon>
+      </Box>
+    </>
+  )
+}