diff --git a/src/components/structure/TableStructureEditorDialog.vue b/src/components/structure/TableStructureEditorDialog.vue
index a1995f7d65..9a199e4331 100644
--- a/src/components/structure/TableStructureEditorDialog.vue
+++ b/src/components/structure/TableStructureEditorDialog.vue
@@ -14,6 +14,7 @@ import {
   Database,
   KeyRound,
   Loader2,
+  Maximize2,
   Plus,
   RefreshCw,
   Save,
@@ -27,6 +28,7 @@ import {
   DropdownMenuContent,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { useConnectionStore } from "@/stores/connectionStore";
 import { useToast } from "@/composables/useToast";
@@ -409,7 +411,43 @@ watch(open, (value) => {
                         />
                       </td>
                       <td class="border-b border-r px-2 py-1.5">
-                        <Input v-model="column.comment" class="h-7 min-w-32 text-xs" :disabled="column.markedForDrop" />
+                        <div class="flex min-w-44 items-center gap-1">
+                          <Input
+                            v-model="column.comment"
+                            class="h-7 min-w-0 flex-1 text-xs"
+                            :disabled="column.markedForDrop"
+                          />
+                          <Popover>
+                            <PopoverTrigger as-child>
+                              <Button
+                                variant="ghost"
+                                size="icon"
+                                class="h-7 w-7 shrink-0"
+                                :disabled="column.markedForDrop"
+                                :aria-label="t('structureEditor.editComment')"
+                                :title="t('structureEditor.editComment')"
+                              >
+                                <Maximize2 class="h-3.5 w-3.5" />
+                              </Button>
+                            </PopoverTrigger>
+                            <PopoverContent align="end" class="w-[420px] p-2.5">
+                              <div class="mb-2 flex items-center justify-between gap-2">
+                                <span class="min-w-0 truncate text-xs font-medium">
+                                  {{ t("structureEditor.editComment") }}
+                                </span>
+                                <span class="max-w-44 truncate font-mono text-[11px] text-muted-foreground">
+                                  {{ column.name || t("structureEditor.columnName") }}
+                                </span>
+                              </div>
+                              <textarea
+                                v-model="column.comment"
+                                class="min-h-36 w-full resize-y rounded-md border bg-background px-2.5 py-2 text-xs leading-5 outline-none focus-visible:ring-2 focus-visible:ring-ring/40 disabled:cursor-not-allowed disabled:opacity-50"
+                                :placeholder="t('structureEditor.commentPlaceholder')"
+                                :disabled="column.markedForDrop"
+                              />
+                            </PopoverContent>
+                          </Popover>
+                        </div>
                       </td>
                       <td class="border-b px-2 py-1.5">
                         <Button
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 1601632021..1deece9c5c 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -761,6 +761,8 @@ export default {
     nullable: "Nullable",
     defaultValue: "Default",
     comment: "Comment",
+    editComment: "Edit comment",
+    commentPlaceholder: "Enter column comment...",
     actions: "Actions",
     indexName: "Index",
     indexColumns: "Columns",
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index c25c01978f..68d49eb1e9 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -674,6 +674,8 @@ export default {
     nullable: "Admite nulos",
     defaultValue: "Valor por defecto",
     comment: "Comentario",
+    editComment: "Editar comentario",
+    commentPlaceholder: "Ingresar comentario de columna...",
     actions: "Acciones",
     indexName: "Índice",
     indexColumns: "Columnas",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 6bf9946326..d1952c54a8 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -743,6 +743,8 @@ export default {
     nullable: "可为空",
     defaultValue: "默认值",
     comment: "注释",
+    editComment: "编辑注释",
+    commentPlaceholder: "输入字段注释...",
     actions: "操作",
     indexName: "索引名",
     indexColumns: "字段列表",
diff --git a/tests/tableStructureEditorPresentation.test.ts b/tests/tableStructureEditorPresentation.test.ts
new file mode 100644
index 0000000000..794a84ecde
--- /dev/null
+++ b/tests/tableStructureEditorPresentation.test.ts
@@ -0,0 +1,12 @@
+import { readFileSync } from "node:fs";
+import { strict as assert } from "node:assert";
+import test from "node:test";
+
+const source = readFileSync("src/components/structure/TableStructureEditorDialog.vue", "utf8");
+
+test("column comments can be expanded into a multiline editor", () => {
+  assert.match(source, /PopoverContent/);
+  assert.match(source, /v-model="column\.comment"/);
+  assert.match(source, /<textarea[\s\S]*v-model="column\.comment"/);
+  assert.match(source, /t\("structureEditor\.editComment"\)/);
+});