diff --git a/admin-spa/src/components/ui/rich-text-editor.tsx b/admin-spa/src/components/ui/rich-text-editor.tsx
index 0eff6f1..cb7ff59 100644
--- a/admin-spa/src/components/ui/rich-text-editor.tsx
+++ b/admin-spa/src/components/ui/rich-text-editor.tsx
@@ -292,27 +292,29 @@ export function RichTextEditor({
       </div>
 
       {/* Editor */}
-      <EditorContent editor={editor} />
+      <div className="overflow-y-auto max-h-[400px] min-h-[200px]">
+        <EditorContent editor={editor} />
+      </div>
 
-      {/* Variables */}
+      {/* Variables Dropdown */}
       {variables.length > 0 && (
         <div className="border-t bg-muted/30 p-3">
-          <div className="text-xs text-muted-foreground mb-2">
-            {__('Available Variables:')}
-          </div>
-          <div className="flex flex-wrap gap-1">
-            {variables.map((variable) => (
-              <Button
-                key={variable}
-                type="button"
-                variant="outline"
-                size="sm"
-                onClick={() => insertVariable(variable)}
-                className="!font-normal !text-xs !px-2"
-              >
-                {`{${variable}}`}
-              </Button>
-            ))}
+          <div className="flex items-center gap-2">
+            <Label htmlFor="variable-select" className="text-xs text-muted-foreground whitespace-nowrap">
+              {__('Insert Variable:')}
+            </Label>
+            <Select onValueChange={(value) => insertVariable(value)}>
+              <SelectTrigger id="variable-select" className="h-8 text-xs">
+                <SelectValue placeholder={__('Choose a variable...')} />
+              </SelectTrigger>
+              <SelectContent>
+                {variables.map((variable) => (
+                  <SelectItem key={variable} value={variable} className="text-xs">
+                    {`{${variable}}`}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
           </div>
         </div>
       )}