diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vue
index 9661682ef1..4b3d0b4bfd 100644
--- a/apps/desktop/src/components/editor/QueryEditor.vue
+++ b/apps/desktop/src/components/editor/QueryEditor.vue
@@ -223,6 +223,20 @@ const zoomCommitScheduler = createEditorZoomCommitScheduler((fontSize) => {
   settingsStore.updateEditorSettings({ fontSize });
 });
 
+const queryEditorAppearanceSettings = computed(() => {
+  const settings = settingsStore.editorSettings;
+  return {
+    fontFamily: settings.fontFamily,
+    fontSize: settings.fontSize,
+    theme: settings.theme,
+    customThemeColors: settings.customThemeColors,
+    customThemes: settings.customThemes,
+    activeCustomThemeId: settings.activeCustomThemeId,
+    wordWrap: settings.wordWrap,
+    shortcuts: settings.shortcuts,
+  };
+});
+
 function syncEditorFontCssVars(fontSize = liveFontSize.value, fontFamily = settingsStore.editorSettings.fontFamily) {
   if (!editorRef.value) return;
   editorRef.value.style.setProperty(EDITOR_FONT_SIZE_CSS_VAR, `${clampEditorFontSize(fontSize)}px`);
@@ -2221,7 +2235,7 @@ function getCurrentCustomThemeColors() {
 
 // Reactively apply editor settings changes
 watch(
-  [() => settingsStore.editorSettings, () => isDark.value],
+  [queryEditorAppearanceSettings, () => isDark.value],
   async ([ss]) => {
     if (!view.value || !codeMirrorTheme || !fontThemeComp || !wordWrapComp || !runKeymapComp || !editorViewModule) {
       return;
diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue
index feb6b91f0a..3c3ea0f9f6 100644
--- a/apps/desktop/src/components/structure/TableStructureEditor.vue
+++ b/apps/desktop/src/components/structure/TableStructureEditor.vue
@@ -87,6 +87,9 @@ const loading = ref(false);
 const saving = ref(false);
 const postSaveRefreshing = ref(false);
 const sqlPreviewLoading = ref(false);
+const indexesLoading = ref(false);
+const foreignKeysLoading = ref(false);
+const triggersLoading = ref(false);
 const ddlContent = ref("");
 const ddlLoading = ref(false);
 const ddlFetched = ref(false);
@@ -111,6 +114,7 @@ const pendingStatements = ref<string[]>([]);
 const warnings = ref<string[]>([]);
 const foreignKeys = ref<EditableStructureForeignKey[]>([]);
 const triggers = ref<EditableStructureTrigger[]>([]);
+const secondaryMetadataLoading = computed(() => indexesLoading.value || foreignKeysLoading.value || triggersLoading.value);
 
 interface StructureRefreshScope {
   columns: boolean;
@@ -224,7 +228,7 @@ const structureDensityMetrics: Record<
   }
 > = {
   compact: {
-    columns: [28, 120, 136, 82, 60, 52, 108, 124, 128, 108],
+    columns: [28, 120, 136, 82, 60, 52, 108, 124, 144, 108],
     indexes: [120, 180, 60, 88, 124, 144, 120, 70],
     minColumnWidth: 24,
     minIndexColumnWidth: 48,
@@ -240,7 +244,7 @@ const structureDensityMetrics: Record<
     lineHeight: 1.35,
   },
   standard: {
-    columns: [32, 144, 160, 104, 72, 64, 128, 152, 152, 136],
+    columns: [32, 144, 160, 104, 72, 64, 128, 152, 160, 136],
     indexes: [148, 224, 72, 108, 148, 180, 148, 84],
     minColumnWidth: 28,
     minIndexColumnWidth: 60,
@@ -256,7 +260,7 @@ const structureDensityMetrics: Record<
     lineHeight: 1.4,
   },
   comfortable: {
-    columns: [36, 168, 188, 116, 84, 76, 152, 188, 176, 148],
+    columns: [36, 168, 188, 116, 84, 76, 152, 188, 188, 148],
     indexes: [176, 260, 84, 124, 176, 216, 176, 104],
     minColumnWidth: 32,
     minIndexColumnWidth: 64,
@@ -282,7 +286,8 @@ function metricsForDensity(density: StructureEditorDensity) {
 }
 
 const structureDensity = computed(() => settingsStore.editorSettings.structureEditorDensity);
-const structureDensityMetric = computed(() => metricsForDensity(structureDensity.value));
+const localStructureDensity = ref<StructureEditorDensity>(structureDensity.value);
+const structureDensityMetric = computed(() => metricsForDensity(localStructureDensity.value));
 const structureDensityOptions = computed(() => [
   { value: "compact", label: t("structureEditor.densityCompact") },
   { value: "standard", label: t("structureEditor.densityStandard") },
@@ -309,9 +314,14 @@ const structureToolbarButtonClass = "h-[var(--structure-control-height)] gap-1 p
 const structureIconButtonClass = "h-[var(--structure-control-height)] w-[var(--structure-control-height)]";
 const structureIconClass = "h-[var(--structure-icon-size)] w-[var(--structure-icon-size)]";
 const structureCheckboxClass = "h-[var(--structure-checkbox-size)] w-[var(--structure-checkbox-size)]";
-const structureHeaderCellClass = "relative border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-left";
-const structureCellClass = "border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-cell-py)]";
-const structureLastCellClass = "border-b px-[var(--structure-cell-px)] py-[var(--structure-cell-py)]";
+const structureHeaderCellClass = "relative min-w-0 overflow-hidden border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-left";
+const structureCellClass = "min-w-0 overflow-hidden border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-cell-py)]";
+const structureLastCellClass = "min-w-0 overflow-hidden border-b px-[var(--structure-cell-px)] py-[var(--structure-cell-py)]";
+const structurePropertyListClass = "flex min-w-0 items-center gap-0 overflow-hidden";
+const structurePropertyLabelClass = "flex min-w-0 items-center gap-1 whitespace-nowrap";
+const structureActionButtonClass = `${structureIconButtonClass} shrink-0`;
+const structureDensityMenuOpen = ref(false);
+const structureDensityMenuRef = ref<HTMLElement>();
 
 function applyStructureDensityWidths(density: StructureEditorDensity) {
   const metric = metricsForDensity(density);
@@ -321,7 +331,64 @@ function applyStructureDensityWidths(density: StructureEditorDensity) {
 
 function setStructureDensity(value: unknown) {
   if (!isStructureEditorDensity(value)) return;
-  settingsStore.updateEditorSettings({ structureEditorDensity: value });
+  if (value === localStructureDensity.value) return;
+  localStructureDensity.value = value;
+}
+
+function selectStructureDensity(value: unknown) {
+  setStructureDensity(value);
+  structureDensityMenuOpen.value = false;
+}
+
+function toggleStructureDensityMenu() {
+  structureDensityMenuOpen.value = !structureDensityMenuOpen.value;
+}
+
+function focusStructureDensityOption(offset: number) {
+  const currentIndex = structureDensityValues.indexOf(localStructureDensity.value);
+  const nextIndex = (currentIndex + offset + structureDensityValues.length) % structureDensityValues.length;
+  selectStructureDensity(structureDensityValues[nextIndex]);
+}
+
+function onStructureDensityKeydown(event: KeyboardEvent) {
+  if (event.key === "Escape") {
+    structureDensityMenuOpen.value = false;
+    return;
+  }
+  if (event.key === "ArrowDown") {
+    event.preventDefault();
+    if (!structureDensityMenuOpen.value) {
+      structureDensityMenuOpen.value = true;
+      return;
+    }
+    focusStructureDensityOption(1);
+    return;
+  }
+  if (event.key === "ArrowUp") {
+    event.preventDefault();
+    if (!structureDensityMenuOpen.value) {
+      structureDensityMenuOpen.value = true;
+      return;
+    }
+    focusStructureDensityOption(-1);
+    return;
+  }
+  if (event.key === "Enter" || event.key === " ") {
+    event.preventDefault();
+    structureDensityMenuOpen.value = !structureDensityMenuOpen.value;
+  }
+}
+
+function onStructureDensityDocumentPointerdown(event: PointerEvent) {
+  if (!structureDensityMenuOpen.value) return;
+  const target = event.target;
+  if (target instanceof Node && structureDensityMenuRef.value?.contains(target)) return;
+  structureDensityMenuOpen.value = false;
+}
+
+function persistStructureDensity(density = localStructureDensity.value) {
+  if (settingsStore.editorSettings.structureEditorDensity === density) return;
+  settingsStore.updateEditorSettings({ structureEditorDensity: density });
 }
 
 const initialDensityMetric = metricsForDensity(structureDensity.value);
@@ -330,7 +397,16 @@ const colResizing = ref<{ col: number; startX: number; startW: number } | null>(
 const indexColWidths = ref([...initialDensityMetric.indexes]);
 const resizing = ref<{ col: number; startX: number; startW: number } | null>(null);
 
-watch(structureDensity, (density, previousDensity) => {
+watch(
+  structureDensity,
+  (density) => {
+    if (density === localStructureDensity.value) return;
+    localStructureDensity.value = density;
+  },
+  { flush: "sync" },
+);
+
+watch(localStructureDensity, (density, previousDensity) => {
   if (density === previousDensity) return;
   applyStructureDensityWidths(density);
 });
@@ -508,11 +584,62 @@ function isManticoreJsonColumn(column: EditableStructureColumn): boolean {
 }
 
 let sqlPreviewRequestId = 0;
+let structureLoadRequestId = 0;
+let sqlPreviewDebounceTimer: ReturnType<typeof setTimeout> | undefined;
+let deferredSqlPreviewRefresh = false;
 let keydownListenerRegistered = false;
 let skipNextRefreshVersion = false;
 
+function hasPendingStructureChanges(): boolean {
+  if (isCreateMode.value) {
+    return !!newTableName.value.trim() || !!tableComment.value.trim() || columns.value.length > 0 || indexes.value.length > 0 || foreignKeys.value.length > 0 || triggers.value.length > 0;
+  }
+  const scope = captureStructureRefreshScope();
+  return scope.columns || scope.indexes || scope.foreignKeys || scope.triggers || scope.tableComment;
+}
+
+function clearSqlPreviewState() {
+  if (sqlPreviewDebounceTimer) {
+    clearTimeout(sqlPreviewDebounceTimer);
+    sqlPreviewDebounceTimer = undefined;
+  }
+  sqlPreviewRequestId++;
+  deferredSqlPreviewRefresh = false;
+  sqlPreviewLoading.value = false;
+  pendingStatements.value = [];
+  warnings.value = [];
+}
+
+function scheduleSqlPreviewRefresh() {
+  if (!hasPendingStructureChanges()) {
+    clearSqlPreviewState();
+    return;
+  }
+  if (!isCreateMode.value && secondaryMetadataLoading.value) {
+    if (sqlPreviewDebounceTimer) {
+      clearTimeout(sqlPreviewDebounceTimer);
+      sqlPreviewDebounceTimer = undefined;
+    }
+    deferredSqlPreviewRefresh = true;
+    sqlPreviewLoading.value = true;
+    return;
+  }
+  deferredSqlPreviewRefresh = false;
+  if (sqlPreviewDebounceTimer) clearTimeout(sqlPreviewDebounceTimer);
+  sqlPreviewDebounceTimer = setTimeout(() => {
+    sqlPreviewDebounceTimer = undefined;
+    void refreshSqlPreview();
+  }, 80);
+}
+
 async function refreshSqlPreview() {
   const requestId = ++sqlPreviewRequestId;
+  if (!hasPendingStructureChanges()) {
+    pendingStatements.value = [];
+    warnings.value = [];
+    sqlPreviewLoading.value = false;
+    return;
+  }
   sqlPreviewLoading.value = true;
   const options = {
     databaseType: databaseType.value,
@@ -539,7 +666,9 @@ async function refreshSqlPreview() {
   }
 }
 
-const canApply = computed(() => !loading.value && !saving.value && !postSaveRefreshing.value && !sqlPreviewLoading.value && pendingStatements.value.length > 0 && warnings.value.length === 0 && !!props.connectionId && (isCreateMode.value ? !!newTableName.value.trim() : !!props.tableName));
+const canApply = computed(
+  () => !loading.value && !saving.value && !postSaveRefreshing.value && !secondaryMetadataLoading.value && !sqlPreviewLoading.value && pendingStatements.value.length > 0 && warnings.value.length === 0 && !!props.connectionId && (isCreateMode.value ? !!newTableName.value.trim() : !!props.tableName),
+);
 
 function resetState() {
   activeTab.value = "columns";
@@ -547,6 +676,9 @@ function resetState() {
   saving.value = false;
   postSaveRefreshing.value = false;
   sqlPreviewLoading.value = false;
+  indexesLoading.value = false;
+  foreignKeysLoading.value = false;
+  triggersLoading.value = false;
   errorMessage.value = "";
   columns.value = [];
   indexes.value = [];
@@ -561,17 +693,51 @@ function resetState() {
   originalTableComment.value = "";
 }
 
-async function loadStructure(silent = false, scope: StructureRefreshScope = FULL_STRUCTURE_REFRESH_SCOPE, showErrors = true) {
-  if (!props.connectionId || !props.database || !props.tableName) return;
-  if (!silent) loading.value = true;
-  errorMessage.value = "";
+function setSecondaryMetadataLoading(scope: StructureRefreshScope, value: boolean) {
+  if (scope.indexes && tableMetadataCapabilities.value.indexes) indexesLoading.value = value;
+  if (scope.foreignKeys && tableMetadataCapabilities.value.foreignKeys) foreignKeysLoading.value = value;
+  if (scope.triggers && tableMetadataCapabilities.value.triggers) triggersLoading.value = value;
+}
+
+async function fetchTableCommentValue(connectionId: string, database: string, schema: string, tableName: string): Promise<string | undefined> {
   try {
-    await store.ensureConnected(props.connectionId);
-    if (scope.columns) {
-      let nextColumns = await api.getColumns(props.connectionId, props.database, metadataSchema.value, props.tableName);
+    return (await api.getTableComment(connectionId, database, schema, tableName)) || "";
+  } catch {
+    try {
+      const tables = await api.listTables(connectionId, database, schema);
+      const table = tables.find((t) => t.name.toLowerCase() === tableName.toLowerCase() && t.table_type !== "VIEW");
+      return table?.comment || "";
+    } catch {
+      return undefined;
+    }
+  }
+}
+
+async function loadStructure(silent = false, scope: StructureRefreshScope = FULL_STRUCTURE_REFRESH_SCOPE, showErrors = true, options: { blockSecondaryMetadata?: boolean } = {}) {
+  const connectionId = props.connectionId;
+  const database = props.database;
+  const schema = metadataSchema.value;
+  const tableName = props.tableName;
+  if (!connectionId || !database || !tableName) return;
+  const requestId = ++structureLoadRequestId;
+  if (!silent) loading.value = true;
+  setSecondaryMetadataLoading(scope, true);
+  errorMessage.value = "";
+  let secondaryMetadataScheduled = false;
+  try {
+    await store.ensureConnected(connectionId);
+
+    const columnsPromise = scope.columns ? api.getColumns(connectionId, database, schema, tableName) : Promise.resolve(undefined);
+    const indexesPromise = scope.indexes ? (tableMetadataCapabilities.value.indexes ? api.listIndexes(connectionId, database, schema, tableName).catch(() => []) : Promise.resolve([])) : Promise.resolve(undefined);
+    const foreignKeysPromise = scope.foreignKeys ? (tableMetadataCapabilities.value.foreignKeys ? api.listForeignKeys(connectionId, database, schema, tableName).catch(() => []) : Promise.resolve([])) : Promise.resolve(undefined);
+    const triggersPromise = scope.triggers ? (tableMetadataCapabilities.value.triggers ? api.listTriggers(connectionId, database, schema, tableName).catch(() => []) : Promise.resolve([])) : Promise.resolve(undefined);
+    const tableCommentPromise = scope.tableComment && structureCapabilities.value.comment ? fetchTableCommentValue(connectionId, database, schema, tableName) : Promise.resolve(undefined);
+
+    let nextColumns = await columnsPromise;
+    if (nextColumns) {
       if (databaseType.value === "manticoresearch" && tableMetadataCapabilities.value.ddl) {
         try {
-          const ddl = await api.getTableDdl(props.connectionId, props.database, metadataSchema.value, props.tableName);
+          const ddl = await api.getTableDdl(connectionId, database, schema, tableName);
           ddlContent.value = ddl;
           ddlFetched.value = true;
           nextColumns = applyManticoreDdlColumnExtras(nextColumns, ddl);
@@ -582,24 +748,29 @@ async function loadStructure(silent = false, scope: StructureRefreshScope = FULL
       columns.value = createColumnDrafts(nextColumns, databaseType.value);
     }
 
-    const [nextIndexes, nextForeignKeys, nextTriggers] = await Promise.all([
-      scope.indexes ? (tableMetadataCapabilities.value.indexes ? api.listIndexes(props.connectionId, props.database, metadataSchema.value, props.tableName).catch(() => []) : Promise.resolve([])) : Promise.resolve(undefined),
-      scope.foreignKeys ? (tableMetadataCapabilities.value.foreignKeys ? api.listForeignKeys(props.connectionId, props.database, metadataSchema.value, props.tableName).catch(() => []) : Promise.resolve([])) : Promise.resolve(undefined),
-      scope.triggers ? (tableMetadataCapabilities.value.triggers ? api.listTriggers(props.connectionId, props.database, metadataSchema.value, props.tableName).catch(() => []) : Promise.resolve([])) : Promise.resolve(undefined),
-    ]);
-    if (nextIndexes) indexes.value = createIndexDrafts(nextIndexes);
-    if (nextForeignKeys) foreignKeys.value = createForeignKeyDrafts(nextForeignKeys);
-    if (nextTriggers) triggers.value = createTriggerDrafts(nextTriggers);
+    const nextTableComment = await tableCommentPromise;
+    if (nextTableComment !== undefined) {
+      originalTableComment.value = nextTableComment;
+      tableComment.value = nextTableComment;
+    }
+    const applySecondaryMetadata = async () => {
+      const [nextIndexes, nextForeignKeys, nextTriggers] = await Promise.all([indexesPromise, foreignKeysPromise, triggersPromise]);
+      if (requestId !== structureLoadRequestId) return;
+      if (nextIndexes) indexes.value = createIndexDrafts(nextIndexes);
+      if (nextForeignKeys) foreignKeys.value = createForeignKeyDrafts(nextForeignKeys);
+      if (nextTriggers) triggers.value = createTriggerDrafts(nextTriggers);
+    };
 
-    if (scope.tableComment) {
-      try {
-        const tables = await api.listTables(props.connectionId, props.database, metadataSchema.value);
-        const table = tables.find((t) => t.name.toLowerCase() === props.tableName!.toLowerCase() && t.table_type !== "VIEW");
-        originalTableComment.value = table?.comment || "";
-        tableComment.value = table?.comment || "";
-      } catch {
-        /* ignore — table comment is optional */
-      }
+    secondaryMetadataScheduled = true;
+    const secondaryMetadataPromise = applySecondaryMetadata()
+      .catch((error) => {
+        console.warn("[DBX][structure-editor:secondary-metadata-failed]", error);
+      })
+      .finally(() => {
+        if (requestId === structureLoadRequestId) setSecondaryMetadataLoading(scope, false);
+      });
+    if (options.blockSecondaryMetadata) {
+      await secondaryMetadataPromise;
     }
   } catch (e: any) {
     if (showErrors) {
@@ -608,13 +779,16 @@ async function loadStructure(silent = false, scope: StructureRefreshScope = FULL
       console.warn("[DBX][structure-editor:refresh-failed]", e);
     }
   } finally {
+    if (!secondaryMetadataScheduled && requestId === structureLoadRequestId) {
+      setSecondaryMetadataLoading(scope, false);
+    }
     if (!silent) loading.value = false;
   }
 }
 
 async function refreshStructureAfterSave(scope: StructureRefreshScope) {
   try {
-    await loadStructure(true, scope, false);
+    await loadStructure(true, scope, false, { blockSecondaryMetadata: true });
   } catch (e) {
     console.warn("[DBX][structure-editor:post-save-refresh-failed]", e);
   } finally {
@@ -627,7 +801,7 @@ async function addColumn() {
   if (!canAddColumn.value) return;
   activeTab.value = "columns";
   const dataType = databaseType.value === "manticoresearch" ? combineDataTypeForDatabase(databaseType.value, dataTypeOptions.value[0] ?? "text", getDefaultLengthForType(databaseType.value, dataTypeOptions.value[0] ?? "text")) : "varchar(255)";
-  columns.value.push({
+  const column: EditableStructureColumn = {
     id: `new:${uuid()}`,
     name: "",
     dataType,
@@ -637,7 +811,8 @@ async function addColumn() {
     isPrimaryKey: false,
     extra: {},
     markedForDrop: false,
-  });
+  };
+  columns.value.push(column);
   await nextTick();
   const newRows = rootRef.value?.querySelectorAll<HTMLElement>('[data-new-column-row="true"]');
   const row = newRows?.[newRows.length - 1];
@@ -652,6 +827,8 @@ function removeNewColumn(column: EditableStructureColumn) {
 }
 
 function canMoveColumn(index: number, direction: -1 | 1): boolean {
+  if (loading.value || saving.value) return false;
+  if (!Number.isInteger(index) || (direction !== -1 && direction !== 1)) return false;
   const targetIndex = index + direction;
   if (targetIndex < 0 || targetIndex >= columns.value.length) return false;
   if (columns.value[index]?.markedForDrop || columns.value[targetIndex]?.markedForDrop) return false;
@@ -666,9 +843,11 @@ const canShowColumnMoveControls = computed(() => isCreateMode.value || structure
 function moveColumn(index: number, direction: -1 | 1) {
   if (!canMoveColumn(index, direction)) return;
   const targetIndex = index + direction;
-  const [column] = columns.value.splice(index, 1);
+  const nextColumns = [...columns.value];
+  const [column] = nextColumns.splice(index, 1);
   if (!column) return;
-  columns.value.splice(targetIndex, 0, column);
+  nextColumns.splice(targetIndex, 0, column);
+  columns.value = nextColumns;
 }
 
 function toggleDropColumn(column: EditableStructureColumn) {
@@ -719,7 +898,7 @@ function isManticoreColumnPropertyDisabled(column: EditableStructureColumn): boo
 }
 
 function addIndex() {
-  if (!structureCapabilities.value.createIndex) return;
+  if (!structureCapabilities.value.createIndex || indexesLoading.value) return;
   activeTab.value = "indexes";
   indexes.value.push({
     id: `new:${uuid()}`,
@@ -809,6 +988,7 @@ function toggleDropIndex(index: EditableStructureIndex) {
 }
 
 function canEditIndexDraft(index: EditableStructureIndex): boolean {
+  if (indexesLoading.value) return false;
   if (index.markedForDrop || index.isPrimary) return false;
   if (!index.original) return structureCapabilities.value.createIndex;
   return structureCapabilities.value.rebuildIndex && structureCapabilities.value.createIndex && structureCapabilities.value.dropIndex;
@@ -823,6 +1003,7 @@ function canEditIndexComment(index: EditableStructureIndex): boolean {
 }
 
 function canDropIndex(index: EditableStructureIndex): boolean {
+  if (indexesLoading.value) return false;
   return !!index.original && !index.isPrimary && structureCapabilities.value.dropIndex;
 }
 
@@ -846,7 +1027,7 @@ function generatedForeignKeyName(column = ""): string {
 }
 
 function addForeignKey() {
-  if (!canEditForeignKeys.value) return;
+  if (!canEditForeignKeys.value || foreignKeysLoading.value) return;
   activeTab.value = "foreignKeys";
   foreignKeys.value.push({
     id: `new:${uuid()}`,
@@ -866,16 +1047,16 @@ function removeNewForeignKey(foreignKey: EditableStructureForeignKey) {
 }
 
 function toggleDropForeignKey(foreignKey: EditableStructureForeignKey) {
-  if (!foreignKey.original) return;
+  if (foreignKeysLoading.value || !foreignKey.original) return;
   foreignKey.markedForDrop = !foreignKey.markedForDrop;
 }
 
 function canEditForeignKeyDraft(foreignKey: EditableStructureForeignKey): boolean {
-  return canEditForeignKeys.value && !foreignKey.markedForDrop;
+  return !foreignKeysLoading.value && canEditForeignKeys.value && !foreignKey.markedForDrop;
 }
 
 function addTrigger() {
-  if (!canEditMysqlTriggers.value) return;
+  if (!canEditMysqlTriggers.value || triggersLoading.value) return;
   activeTab.value = "triggers";
   triggers.value.push({
     id: `new:${uuid()}`,
@@ -892,12 +1073,12 @@ function removeNewTrigger(trigger: EditableStructureTrigger) {
 }
 
 function toggleDropTrigger(trigger: EditableStructureTrigger) {
-  if (!trigger.original) return;
+  if (triggersLoading.value || !trigger.original) return;
   trigger.markedForDrop = !trigger.markedForDrop;
 }
 
 function canEditTriggerDraft(trigger: EditableStructureTrigger): boolean {
-  return canEditMysqlTriggers.value && !trigger.markedForDrop;
+  return !triggersLoading.value && canEditMysqlTriggers.value && !trigger.markedForDrop;
 }
 
 function primarySqlOperation(sql: string): string {
@@ -1012,12 +1193,14 @@ function registerStructureEditorShortcuts() {
   if (keydownListenerRegistered) return;
   keydownListenerRegistered = true;
   window.addEventListener("keydown", onStructureEditorKeydown);
+  document.addEventListener("pointerdown", onStructureDensityDocumentPointerdown, true);
 }
 
 function unregisterStructureEditorShortcuts() {
   if (!keydownListenerRegistered) return;
   keydownListenerRegistered = false;
   window.removeEventListener("keydown", onStructureEditorKeydown);
+  document.removeEventListener("pointerdown", onStructureDensityDocumentPointerdown, true);
 }
 
 onMounted(() => {
@@ -1033,6 +1216,8 @@ onActivated(() => {
 onDeactivated(unregisterStructureEditorShortcuts);
 onBeforeUnmount(() => {
   unregisterStructureEditorShortcuts();
+  clearSqlPreviewState();
+  persistStructureDensity();
 });
 
 function firstStructureMetadataTab(capabilities = tableMetadataCapabilities.value) {
@@ -1057,11 +1242,16 @@ watch(tableMetadataCapabilities, (capabilities) => {
 watch(
   [isCreateMode, databaseType, () => props.schema, () => props.tableName, newTableName, tableComment, columns, indexes, foreignKeys, triggers],
   () => {
-    void refreshSqlPreview();
+    scheduleSqlPreviewRefresh();
   },
   { deep: true, immediate: true },
 );
 
+watch(secondaryMetadataLoading, (value) => {
+  if (value || !deferredSqlPreviewRefresh) return;
+  scheduleSqlPreviewRefresh();
+});
+
 watch([() => props.tableName, newTableName], () => {
   for (const index of indexes.value) {
     refreshAutoIndexName(index);
@@ -1085,7 +1275,7 @@ watch(activeTab, (tab) => {
 </script>
 
 <template>
-  <div ref="rootRef" class="flex h-full min-h-0 flex-col gap-2 overflow-hidden p-[var(--structure-shell-padding)] text-[length:var(--structure-font-size)]" :data-structure-density="structureDensity" :style="structureDensityStyle">
+  <div ref="rootRef" class="flex h-full min-h-0 flex-col gap-2 overflow-hidden p-[var(--structure-shell-padding)] text-[length:var(--structure-font-size)]" :data-structure-density="localStructureDensity" :style="structureDensityStyle">
     <div class="flex shrink-0 items-center gap-2 rounded-md border bg-muted/20 px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-[length:var(--structure-font-size)]">
       <Database :class="[structureIconClass, 'text-muted-foreground']" />
       <span class="min-w-0 flex-1 truncate font-medium">{{ targetLabel || t("editor.noDatabase") }}</span>
@@ -1131,30 +1321,48 @@ watch(activeTab, (tab) => {
             <div class="flex shrink-0 items-center gap-1.5">
               <div class="flex items-center gap-1.5">
                 <SlidersHorizontal :class="[structureIconClass, 'text-muted-foreground']" />
-                <Select :model-value="structureDensity" @update:model-value="setStructureDensity">
-                  <SelectTrigger size="sm" class="h-[var(--structure-control-height)] w-[108px] rounded-md px-[var(--structure-control-px)] text-[length:var(--structure-font-size)]" :aria-label="t('structureEditor.density')">
-                    <SelectValue :placeholder="t('structureEditor.density')" />
-                  </SelectTrigger>
-                  <SelectContent align="end" class="min-w-28">
-                    <SelectItem v-for="option in structureDensityOptions" :key="option.value" :value="option.value">
+                <div ref="structureDensityMenuRef" class="relative">
+                  <button
+                    type="button"
+                    class="flex h-[var(--structure-control-height)] min-w-[76px] items-center justify-between rounded-md border bg-background px-[var(--structure-control-px)] text-[length:var(--structure-font-size)] outline-none hover:bg-muted focus-visible:ring-2 focus-visible:ring-ring/40"
+                    :aria-label="t('structureEditor.density')"
+                    :aria-expanded="structureDensityMenuOpen"
+                    aria-haspopup="listbox"
+                    @click="toggleStructureDensityMenu"
+                    @keydown="onStructureDensityKeydown"
+                  >
+                    <span class="truncate">{{ structureDensityOptions.find((option) => option.value === localStructureDensity)?.label }}</span>
+                    <ChevronDown :class="[structureIconClass, 'ml-1 shrink-0 opacity-50']" />
+                  </button>
+                  <div v-if="structureDensityMenuOpen" class="absolute right-0 top-[calc(100%+4px)] z-50 min-w-full rounded-lg bg-popover p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10" role="listbox" :aria-label="t('structureEditor.density')">
+                    <button
+                      v-for="option in structureDensityOptions"
+                      :key="option.value"
+                      type="button"
+                      class="flex h-7 w-full items-center rounded-md px-1.5 text-left text-[length:var(--structure-font-size)] outline-none hover:bg-accent hover:text-accent-foreground"
+                      :class="option.value === localStructureDensity ? 'bg-accent text-accent-foreground' : ''"
+                      role="option"
+                      :aria-selected="option.value === localStructureDensity"
+                      @click="selectStructureDensity(option.value)"
+                    >
                       {{ option.label }}
-                    </SelectItem>
-                  </SelectContent>
-                </Select>
+                    </button>
+                  </div>
+                </div>
               </div>
               <Button v-if="activeTab === 'columns'" size="sm" :class="structureToolbarButtonClass" :disabled="!canAddColumn" @click="addColumn">
                 <Plus :class="structureIconClass" />
                 {{ t("structureEditor.addColumn") }}
               </Button>
-              <Button v-if="activeTab === 'indexes'" size="sm" :class="structureToolbarButtonClass" :disabled="!structureCapabilities.createIndex" @click="addIndex">
+              <Button v-if="activeTab === 'indexes'" size="sm" :class="structureToolbarButtonClass" :disabled="!structureCapabilities.createIndex || indexesLoading" @click="addIndex">
                 <Plus :class="structureIconClass" />
                 {{ t("structureEditor.addIndex") }}
               </Button>
-              <Button v-if="activeTab === 'foreignKeys'" size="sm" :class="structureToolbarButtonClass" :disabled="!canEditForeignKeys" @click="addForeignKey">
+              <Button v-if="activeTab === 'foreignKeys'" size="sm" :class="structureToolbarButtonClass" :disabled="!canEditForeignKeys || foreignKeysLoading" @click="addForeignKey">
                 <Plus :class="structureIconClass" />
                 {{ t("structureEditor.addForeignKey") }}
               </Button>
-              <Button v-if="activeTab === 'triggers'" size="sm" :class="structureToolbarButtonClass" :disabled="!canEditMysqlTriggers" @click="addTrigger">
+              <Button v-if="activeTab === 'triggers'" size="sm" :class="structureToolbarButtonClass" :disabled="!canEditMysqlTriggers || triggersLoading" @click="addTrigger">
                 <Plus :class="structureIconClass" />
                 {{ t("structureEditor.addTrigger") }}
               </Button>
@@ -1165,7 +1373,15 @@ watch(activeTab, (tab) => {
             <table class="border-separate border-spacing-0 text-[length:var(--structure-font-size)] leading-[var(--structure-line-height)]" :style="{ minWidth: visibleColWidths.reduce((a, w) => a + w, 0) + 'px' }">
               <thead class="sticky top-0 z-10 bg-background">
                 <tr>
-                  <th v-for="(columnLabel, i) in colLabels" :key="columnLabel.key" :class="[structureHeaderCellClass, { 'text-center': columnLabel.key === 'primaryKey' }]" :style="{ width: visibleColWidths[i] + 'px', minWidth: visibleColWidths[i] + 'px' }">
+                  <th
+                    v-for="(columnLabel, i) in colLabels"
+                    :key="columnLabel.key"
+                    :class="[structureHeaderCellClass, { 'text-center': columnLabel.key === 'primaryKey' }]"
+                    :style="{
+                      width: visibleColWidths[i] + 'px',
+                      minWidth: visibleColWidths[i] + 'px',
+                    }"
+                  >
                     {{ columnLabel.label }}
                     <div v-if="i < colLabels.length - 1" class="absolute right-0 top-0 z-20 h-full w-1 cursor-col-resize hover:bg-primary/30" :class="colResizing?.col === columnWidthIndex(i) ? 'bg-primary/30' : ''" @mousedown="onColResize($event, i)" />
                   </th>
@@ -1265,39 +1481,39 @@ watch(activeTab, (tab) => {
                     </div>
                   </td>
                   <td v-if="showExtendedProperties" :class="structureCellClass">
-                    <div class="flex items-center gap-2">
+                    <div :class="structurePropertyListClass">
                       <!-- Manticore Search: character data type properties -->
                       <template v-if="databaseType === 'manticoresearch'">
                         <template v-if="isManticoreTextColumn(column)">
-                          <label class="flex items-center gap-1 whitespace-nowrap">
-                            <input :checked="!!column.extra.manticoreIndexed" type="checkbox" :class="structureCheckboxClass" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreIndexed = ($event.target as HTMLInputElement).checked" />
-                            indexed
+                          <label :class="structurePropertyLabelClass" title="indexed">
+                            <input :checked="!!column.extra.manticoreIndexed" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreIndexed = ($event.target as HTMLInputElement).checked" />
+                            <span class="min-w-0 truncate">indexed</span>
                           </label>
-                          <label class="flex items-center gap-1 whitespace-nowrap">
-                            <input :checked="!!column.extra.manticoreStored" type="checkbox" :class="structureCheckboxClass" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreStored = ($event.target as HTMLInputElement).checked" />
-                            stored
+                          <label :class="structurePropertyLabelClass" title="stored">
+                            <input :checked="!!column.extra.manticoreStored" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreStored = ($event.target as HTMLInputElement).checked" />
+                            <span class="min-w-0 truncate">stored</span>
                           </label>
-                          <label class="flex items-center gap-1 whitespace-nowrap">
-                            <input :checked="!!column.extra.manticoreAttribute" type="checkbox" :class="structureCheckboxClass" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreAttribute = ($event.target as HTMLInputElement).checked" />
-                            attribute
+                          <label :class="structurePropertyLabelClass" title="attribute">
+                            <input :checked="!!column.extra.manticoreAttribute" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreAttribute = ($event.target as HTMLInputElement).checked" />
+                            <span class="min-w-0 truncate">attribute</span>
                           </label>
                         </template>
                         <template v-else-if="isManticoreJsonColumn(column)">
-                          <label class="flex items-center gap-1 whitespace-nowrap">
-                            <input :checked="!!column.extra.manticoreSecondaryIndex" type="checkbox" :class="structureCheckboxClass" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreSecondaryIndex = ($event.target as HTMLInputElement).checked" />
-                            secondary_index
+                          <label :class="structurePropertyLabelClass" title="secondary_index">
+                            <input :checked="!!column.extra.manticoreSecondaryIndex" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" :disabled="isManticoreColumnPropertyDisabled(column)" @change="column.extra.manticoreSecondaryIndex = ($event.target as HTMLInputElement).checked" />
+                            <span class="min-w-0 truncate">secondary_index</span>
                           </label>
                         </template>
                       </template>
                       <!-- MySQL: AUTO_INCREMENT + ON UPDATE CURRENT_TIMESTAMP -->
                       <template v-else-if="structureDialect === 'mysql'">
-                        <label class="flex items-center gap-1 whitespace-nowrap">
-                          <input v-model="column.extra.autoIncrement" type="checkbox" :class="structureCheckboxClass" />
-                          {{ t("structureEditor.autoIncrement") }}
+                        <label :class="[structurePropertyLabelClass, 'shrink-0 pr-1']" :title="t('structureEditor.autoIncrement')">
+                          <input v-model="column.extra.autoIncrement" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" />
+                          <span>{{ t("structureEditor.autoIncrement") }}</span>
                         </label>
-                        <label class="flex items-center gap-1 whitespace-nowrap">
-                          <input v-model="column.extra.onUpdateCurrentTimestamp" type="checkbox" :class="structureCheckboxClass" />
-                          {{ t("structureEditor.onUpdateCurrentTimestamp") }}
+                        <label :class="[structurePropertyLabelClass, 'flex-1 basis-0']" :title="t('structureEditor.onUpdateCurrentTimestamp')">
+                          <input v-model="column.extra.onUpdateCurrentTimestamp" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" />
+                          <span class="min-w-0 truncate">{{ t("structureEditor.onUpdateCurrentTimestamp") }}</span>
                         </label>
                       </template>
                       <!-- PostgreSQL: IDENTITY -->
@@ -1358,9 +1574,9 @@ watch(activeTab, (tab) => {
                       </template>
                       <!-- SQL Server: IDENTITY -->
                       <template v-else-if="structureDialect === 'sqlserver'">
-                        <label class="flex items-center gap-1 whitespace-nowrap">
-                          <input v-model="column.extra.autoIncrement" type="checkbox" :class="structureCheckboxClass" />
-                          {{ t("structureEditor.identity") }}
+                        <label :class="structurePropertyLabelClass" :title="t('structureEditor.identity')">
+                          <input v-model="column.extra.autoIncrement" type="checkbox" :class="[structureCheckboxClass, 'shrink-0']" />
+                          <span class="min-w-0 truncate">{{ t("structureEditor.identity") }}</span>
                         </label>
                         <template v-if="column.extra.autoIncrement">
                           <Input
@@ -1392,22 +1608,30 @@ watch(activeTab, (tab) => {
                     </div>
                   </td>
                   <td :class="structureLastCellClass">
-                    <div class="flex items-center gap-1">
+                    <div class="flex min-w-0 items-center justify-start gap-0.5 overflow-hidden">
                       <template v-if="canShowColumnMoveControls || !column.original">
-                        <Button variant="ghost" size="icon" :class="structureIconButtonClass" :disabled="!canMoveColumn(index, -1)" :title="t('structureEditor.moveColumnUp')" :aria-label="t('structureEditor.moveColumnUp')" @click="moveColumn(index, -1)">
+                        <Button type="button" variant="ghost" size="icon" :class="structureActionButtonClass" :disabled="!canMoveColumn(index, -1)" :title="t('structureEditor.moveColumnUp')" :aria-label="t('structureEditor.moveColumnUp')" @click.stop.prevent="moveColumn(index, -1)">
                           <ChevronUp :class="structureIconClass" />
                         </Button>
-                        <Button variant="ghost" size="icon" :class="structureIconButtonClass" :disabled="!canMoveColumn(index, 1)" :title="t('structureEditor.moveColumnDown')" :aria-label="t('structureEditor.moveColumnDown')" @click="moveColumn(index, 1)">
+                        <Button type="button" variant="ghost" size="icon" :class="structureActionButtonClass" :disabled="!canMoveColumn(index, 1)" :title="t('structureEditor.moveColumnDown')" :aria-label="t('structureEditor.moveColumnDown')" @click.stop.prevent="moveColumn(index, 1)">
                           <ChevronDown :class="structureIconClass" />
                         </Button>
                       </template>
-                      <Button v-if="column.original" variant="ghost" size="sm" :class="structureToolbarButtonClass" :disabled="!canDropColumn(column)" @click="toggleDropColumn(column)">
-                        <Trash2 :class="structureIconClass" />
-                        {{ column.markedForDrop ? t("structureEditor.restore") : t("structureEditor.drop") }}
+                      <Button
+                        v-if="column.original"
+                        variant="ghost"
+                        size="icon"
+                        :class="structureActionButtonClass"
+                        :disabled="!canDropColumn(column)"
+                        :title="column.markedForDrop ? t('structureEditor.restore') : t('structureEditor.drop')"
+                        :aria-label="column.markedForDrop ? t('structureEditor.restore') : t('structureEditor.drop')"
+                        @click="toggleDropColumn(column)"
+                      >
+                        <RefreshCw v-if="column.markedForDrop" :class="structureIconClass" />
+                        <Trash2 v-else :class="structureIconClass" />
                       </Button>
-                      <Button v-else variant="ghost" size="sm" :class="structureToolbarButtonClass" @click="removeNewColumn(column)">
+                      <Button v-else variant="ghost" size="icon" :class="structureActionButtonClass" :title="t('structureEditor.remove')" :aria-label="t('structureEditor.remove')" @click="removeNewColumn(column)">
                         <X :class="structureIconClass" />
-                        {{ t("structureEditor.remove") }}
                       </Button>
                     </div>
                   </td>
@@ -1417,7 +1641,11 @@ watch(activeTab, (tab) => {
           </TabsContent>
 
           <TabsContent v-if="tableMetadataCapabilities.indexes" value="indexes" class="m-0 min-h-0 flex-1 overflow-auto p-0">
-            <table class="border-separate border-spacing-0 text-[length:var(--structure-font-size)] leading-[var(--structure-line-height)]" :style="{ minWidth: indexColWidths.reduce((a, w) => a + w, 0) + 'px' }">
+            <div v-if="indexesLoading" class="flex items-center justify-center gap-2 py-10 text-muted-foreground">
+              <Loader2 class="h-4 w-4 animate-spin" />
+              {{ t("common.loading") }}
+            </div>
+            <table v-else class="border-separate border-spacing-0 text-[length:var(--structure-font-size)] leading-[var(--structure-line-height)]" :style="{ minWidth: indexColWidths.reduce((a, w) => a + w, 0) + 'px' }">
               <thead class="sticky top-0 z-10 bg-background">
                 <tr>
                   <th
@@ -1517,7 +1745,11 @@ watch(activeTab, (tab) => {
           </TabsContent>
 
           <TabsContent v-if="tableMetadataCapabilities.foreignKeys" value="foreignKeys" class="m-0 min-h-0 flex-1 overflow-auto p-[var(--structure-cell-px)]">
-            <div v-if="foreignKeys.length === 0" class="py-10 text-center text-muted-foreground">
+            <div v-if="foreignKeysLoading" class="flex items-center justify-center gap-2 py-10 text-muted-foreground">
+              <Loader2 class="h-4 w-4 animate-spin" />
+              {{ t("common.loading") }}
+            </div>
+            <div v-else-if="foreignKeys.length === 0" class="py-10 text-center text-muted-foreground">
               {{ t("structureEditor.emptyReadonly") }}
             </div>
             <div v-else class="space-y-1.5">
@@ -1563,7 +1795,11 @@ watch(activeTab, (tab) => {
           </TabsContent>
 
           <TabsContent v-if="tableMetadataCapabilities.triggers" value="triggers" class="m-0 min-h-0 flex-1 overflow-auto p-[var(--structure-cell-px)]">
-            <div v-if="triggers.length === 0" class="py-10 text-center text-muted-foreground">
+            <div v-if="triggersLoading" class="flex items-center justify-center gap-2 py-10 text-muted-foreground">
+              <Loader2 class="h-4 w-4 animate-spin" />
+              {{ t("common.loading") }}
+            </div>
+            <div v-else-if="triggers.length === 0" class="py-10 text-center text-muted-foreground">
               {{ t("structureEditor.emptyReadonly") }}
             </div>
             <div v-else class="space-y-1.5">
diff --git a/apps/desktop/src/lib/api.ts b/apps/desktop/src/lib/api.ts
index 0eb234c284..484d788570 100644
--- a/apps/desktop/src/lib/api.ts
+++ b/apps/desktop/src/lib/api.ts
@@ -113,6 +113,7 @@ export const loadSchemaCache = forward("loadSchemaCache");
 export const deleteSchemaCachePrefix = forward("deleteSchemaCachePrefix");
 export const listSchemas = forward("listSchemas");
 export const listTables = forward("listTables");
+export const getTableComment = forward("getTableComment");
 export const listObjects = forward("listObjects");
 export const listObjectStatistics = forward("listObjectStatistics");
 export const listCompletionObjects = forward("listCompletionObjects");
diff --git a/apps/desktop/src/lib/http.ts b/apps/desktop/src/lib/http.ts
index 91a781a60d..446b98665a 100644
--- a/apps/desktop/src/lib/http.ts
+++ b/apps/desktop/src/lib/http.ts
@@ -455,6 +455,10 @@ export async function listTables(connectionId: string, database: string, schema:
   return get(`/api/schema/tables?${qs({ connection_id: connectionId, database, schema, filter, limit, offset, object_types: objectTypes?.join(",") })}`);
 }
 
+export async function getTableComment(_connectionId: string, _database: string, _schema: string, _table: string): Promise<string | null> {
+  throw new Error("Table comment lookup is not available in the web backend");
+}
+
 export async function listObjects(connectionId: string, database: string, schema: string, objectTypes?: SidebarObjectKind[]): Promise<ObjectInfo[]> {
   return get(
     `/api/schema/objects?${qs({
diff --git a/apps/desktop/src/lib/tauri.ts b/apps/desktop/src/lib/tauri.ts
index 97d6719943..444fdd7a50 100644
--- a/apps/desktop/src/lib/tauri.ts
+++ b/apps/desktop/src/lib/tauri.ts
@@ -517,6 +517,10 @@ export async function listTables(connectionId: string, database: string, schema:
   return invoke("list_tables", { connectionId, database, schema, filter, limit, offset, objectTypes });
 }
 
+export async function getTableComment(connectionId: string, database: string, schema: string, table: string): Promise<string | null> {
+  return invoke("get_table_comment", { connectionId, database, schema, table });
+}
+
 export async function listObjects(connectionId: string, database: string, schema: string, objectTypes?: SidebarObjectKind[]): Promise<ObjectInfo[]> {
   return invoke("list_objects", { connectionId, database, schema, objectTypes });
 }
diff --git a/crates/dbx-core/src/db/mysql.rs b/crates/dbx-core/src/db/mysql.rs
index e8c0120b6b..5ea93574d6 100644
--- a/crates/dbx-core/src/db/mysql.rs
+++ b/crates/dbx-core/src/db/mysql.rs
@@ -1025,6 +1025,29 @@ pub async fn list_tables(pool: &MySqlPool, database: &str) -> Result<Vec<TableIn
     Ok(tables)
 }
 
+fn table_comment_sql(database: &str, table: &str) -> String {
+    format!(
+        "SELECT TABLE_COMMENT \
+         FROM information_schema.TABLES \
+         WHERE TABLE_SCHEMA = {} AND TABLE_NAME = {} AND TABLE_TYPE <> 'VIEW' \
+         LIMIT 1",
+        quote_value(database),
+        quote_value(table),
+    )
+}
+
+pub async fn get_table_comment(pool: &MySqlPool, database: &str, table: &str) -> Result<Option<String>, String> {
+    let sql = table_comment_sql(database, table);
+    let mut conn = pool.get_conn().await.map_err(|e| e.to_string())?;
+    let result = conn.query_iter(&sql).await.map_err(|e| e.to_string())?;
+    let rows: Vec<mysql_async::Row> = result.collect_and_drop().await.map_err(|e| e.to_string())?;
+    Ok(rows
+        .first()
+        .and_then(|row| get_opt_str(row, "TABLE_COMMENT"))
+        .map(|s| fix_potential_double_encoding(&s))
+        .filter(|s| !s.is_empty()))
+}
+
 #[derive(Clone, Debug, Default)]
 struct TableStatusMeta {
     comment: Option<String>,
@@ -2074,6 +2097,18 @@ mod tests {
         assert!(sql.contains("UPDATE_TIME"));
     }
 
+    #[test]
+    fn mysql_table_comment_sql_targets_single_table() {
+        let sql = table_comment_sql("app", "users");
+
+        assert!(sql.contains("SELECT TABLE_COMMENT"));
+        assert!(sql.contains("TABLE_SCHEMA = 'app'"));
+        assert!(sql.contains("TABLE_NAME = 'users'"));
+        assert!(sql.contains("TABLE_TYPE <> 'VIEW'"));
+        assert!(sql.contains("LIMIT 1"));
+        assert!(!sql.contains("ORDER BY"));
+    }
+
     #[test]
     fn mysql_database_infos_filter_blank_names_and_keep_catalogless_marker() {
         let regular = database_infos_from_names(vec!["".to_string(), " app ".to_string(), "mysql".to_string()], true);
diff --git a/crates/dbx-core/src/db/postgres.rs b/crates/dbx-core/src/db/postgres.rs
index 1b3ae1f966..935b278409 100644
--- a/crates/dbx-core/src/db/postgres.rs
+++ b/crates/dbx-core/src/db/postgres.rs
@@ -964,6 +964,22 @@ pub async fn list_tables_filtered(
         .collect())
 }
 
+pub async fn get_table_comment(pool: &Pool, schema: &str, table: &str) -> Result<Option<String>, String> {
+    let schema = if schema.is_empty() { "public" } else { schema };
+    let client = pool.get().await.map_err(|e| e.to_string())?;
+    let stmt = client.prepare_cached(postgres_table_comment_sql()).await.map_err(|e| e.to_string())?;
+    let rows = client.query(&stmt, &[&schema, &table]).await.map_err(|e| e.to_string())?;
+    Ok(rows.first().and_then(|row| row.try_get::<_, Option<String>>(0).ok().flatten()).filter(|s| !s.is_empty()))
+}
+
+fn postgres_table_comment_sql() -> &'static str {
+    "SELECT obj_description(c.oid) AS table_comment \
+     FROM pg_catalog.pg_class c \
+     JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace \
+     WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r','m','f','p') \
+     LIMIT 1"
+}
+
 fn postgres_tables_sql() -> &'static str {
     "SELECT c.relname AS table_name, \
          CASE c.relkind WHEN 'r' THEN 'BASE TABLE' WHEN 'v' THEN 'VIEW' \
@@ -2292,6 +2308,17 @@ mod tests {
         assert!(sql.contains("FOREIGN TABLE"));
     }
 
+    #[test]
+    fn postgres_table_comment_sql_targets_single_table() {
+        let sql = postgres_table_comment_sql();
+
+        assert!(sql.contains("obj_description(c.oid)"));
+        assert!(sql.contains("n.nspname = $1"));
+        assert!(sql.contains("c.relname = $2"));
+        assert!(sql.contains("LIMIT 1"));
+        assert!(!sql.contains("ORDER BY"));
+    }
+
     #[test]
     fn postgres_column_metadata_reads_identity_extra() {
         assert!(POSTGRES_COLUMNS_SQL.contains("a.attidentity"));
diff --git a/crates/dbx-core/src/schema.rs b/crates/dbx-core/src/schema.rs
index ea24291750..2cec8a12df 100644
--- a/crates/dbx-core/src/schema.rs
+++ b/crates/dbx-core/src/schema.rs
@@ -494,6 +494,46 @@ pub async fn list_tables_core(
     .await
 }
 
+pub async fn get_table_comment_core(
+    state: &AppState,
+    connection_id: &str,
+    database: &str,
+    schema: &str,
+    table: &str,
+) -> Result<Option<String>, String> {
+    if crate::sql_dialect::parse_sqlserver_linked_schema_ref(schema).is_some() {
+        return Err("Table comments are not available for linked server tables".to_string());
+    }
+
+    retry_metadata_connection(state, connection_id, Some(database), || async {
+        let pool_key = state.get_or_create_pool(connection_id, Some(database)).await?;
+        let db_config = connection_config(state, connection_id).await;
+
+        {
+            let connections = state.connections.read().await;
+            try_sqlserver!(connections, &pool_key, get_table_comment, schema, table);
+        }
+
+        let connections = state.connections.read().await;
+        let pool = connections.get(&pool_key).ok_or("Pool not found")?;
+
+        match pool {
+            PoolKind::Mysql(p, mode)
+                if *mode != MysqlMode::OceanBaseOracle
+                    && !db_config.as_ref().is_some_and(is_doris_family_config)
+                    && !db_config.as_ref().is_some_and(is_manticoresearch_config) =>
+            {
+                db::mysql::get_table_comment(p, schema, table).await
+            }
+            PoolKind::Postgres(p) if !db_config.as_ref().is_some_and(is_questdb_config) => {
+                db::postgres::get_table_comment(p, schema, table).await
+            }
+            _ => Err("Table comment lookup is not supported for this connection".to_string()),
+        }
+    })
+    .await
+}
+
 async fn list_tables_once(
     state: &AppState,
     connection_id: &str,
diff --git a/src-tauri/src/commands/schema.rs b/src-tauri/src/commands/schema.rs
index 6264845099..789f248501 100644
--- a/src-tauri/src/commands/schema.rs
+++ b/src-tauri/src/commands/schema.rs
@@ -96,6 +96,17 @@ pub async fn list_tables(
     .await
 }
 
+#[tauri::command]
+pub async fn get_table_comment(
+    state: State<'_, Arc<AppState>>,
+    connection_id: String,
+    database: String,
+    schema: String,
+    table: String,
+) -> Result<Option<String>, String> {
+    dbx_core::schema::get_table_comment_core(&state, &connection_id, &database, &schema, &table).await
+}
+
 #[tauri::command]
 pub async fn list_objects(
     state: State<'_, Arc<AppState>>,
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index a3eaeb0920..3dee3b1035 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -446,6 +446,7 @@ pub fn run() {
             commands::schema::list_sqlserver_linked_server_schemas,
             commands::schema::list_sqlserver_linked_server_tables,
             commands::schema::list_tables,
+            commands::schema::get_table_comment,
             commands::schema::list_objects,
             commands::schema::list_object_statistics,
             commands::schema::list_completion_objects,