diff --git a/frontend/app/(main)/mail/imap/ComposeDialog.tsx b/frontend/app/(main)/mail/imap/ComposeDialog.tsx
index 15b3d95c..296d7960 100644
--- a/frontend/app/(main)/mail/imap/ComposeDialog.tsx
+++ b/frontend/app/(main)/mail/imap/ComposeDialog.tsx
@@ -104,8 +104,8 @@ export default function ComposeDialog({
             {mode === "reply" ? "답장" : mode === "forward" ? "전달" : "새 메일"}
           </DialogTitle>
         </DialogHeader>
-        <div className="space-y-3">
-          <div>
+        <div className="space-y-4">
+          <div className="space-y-1.5">
             <Label>보내는 사람</Label>
             <Select
               value={fromAccountId?.toString() ?? ""}
@@ -123,19 +123,19 @@ export default function ComposeDialog({
               </SelectContent>
             </Select>
           </div>
-          <div>
+          <div className="space-y-1.5">
             <Label>받는사람</Label>
             <Input value={to} onChange={(e) => setTo(e.target.value)} placeholder="to@example.com" />
           </div>
-          <div>
+          <div className="space-y-1.5">
             <Label>참조(CC)</Label>
             <Input value={cc} onChange={(e) => setCc(e.target.value)} placeholder="cc@example.com (선택)" />
           </div>
-          <div>
+          <div className="space-y-1.5">
             <Label>제목</Label>
             <Input value={subject} onChange={(e) => setSubject(e.target.value)} />
           </div>
-          <div>
+          <div className="space-y-1.5">
             <Label>내용</Label>
             <EditorContent editor={editor} />
           </div>
diff --git a/frontend/app/(main)/mail/imap/page.tsx b/frontend/app/(main)/mail/imap/page.tsx
index 8100a1c8..4dc6362f 100644
--- a/frontend/app/(main)/mail/imap/page.tsx
+++ b/frontend/app/(main)/mail/imap/page.tsx
@@ -999,6 +999,7 @@ export default function ImapMailPage() {
                   type={showPassword ? "text" : "password"}
                   value={form.password}
                   onChange={(e) => setForm((p) => ({ ...p, password: e.target.value }))}
+                  onKeyDown={(e) => { if (e.key === "Enter") handleSave(); }}
                   placeholder="••••••••"
                   className="pr-9"
                 />