diff --git a/plugins/text-editor-assets/lang/cs.json b/plugins/text-editor-assets/lang/cs.json
index 4f73be70cae..45fd2fa1777 100644
--- a/plugins/text-editor-assets/lang/cs.json
+++ b/plugins/text-editor-assets/lang/cs.json
@@ -75,6 +75,7 @@
     "SeeOriginalData": "Zobrazit původní data",
     "CategoryVersioning": "Verzování",
     "TableDiffLabel": "Změny v tabulce",
+    "TableRefreshConfirmationLabel": "Potvrdit obnovení tabulky",
     "ConvertToLinkPreview": "Zobrazit jako odkaz",
     "ConvertToEmbedPreview": "Zobrazit jako náhled obsahu",
     "UnableToLoadEmbeddedContent": "Náhled odkazu nelze načíst kvůli nastavení oprávnění nebo nepodporovanému obsahu",
diff --git a/plugins/text-editor-assets/lang/de.json b/plugins/text-editor-assets/lang/de.json
index 7f6d09a85ec..4befbc7a242 100644
--- a/plugins/text-editor-assets/lang/de.json
+++ b/plugins/text-editor-assets/lang/de.json
@@ -74,6 +74,7 @@
     "SeeOriginalData": "Originaldaten anzeigen",
     "CategoryVersioning": "Versionierung",
     "TableDiffLabel": "Tabellenänderungen",
+    "TableRefreshConfirmationLabel": "Tabellenaktualisierung bestätigen",
     "ConvertToLinkPreview": "Als Link anzeigen",
     "ConvertToEmbedPreview": "Als Inhaltsvorschau anzeigen",
     "UnableToLoadEmbeddedContent": "Die Linkvorschau konnte aufgrund von Berechtigungseinstellungen oder nicht unterstütztem Inhalt nicht geladen werden",
diff --git a/plugins/text-editor-assets/lang/en.json b/plugins/text-editor-assets/lang/en.json
index 04b94891c68..0de83843d69 100644
--- a/plugins/text-editor-assets/lang/en.json
+++ b/plugins/text-editor-assets/lang/en.json
@@ -75,6 +75,7 @@
     "SeeOriginalData": "See Original Data",
     "CategoryVersioning": "Versioning",
     "TableDiffLabel": "Table Changes",
+    "TableRefreshConfirmationLabel": "Confirm Table Refresh",
 
     "ConvertToLinkPreview": "Show as a link",
     "ConvertToEmbedPreview": "Show as a content preview",
diff --git a/plugins/text-editor-assets/lang/es.json b/plugins/text-editor-assets/lang/es.json
index 6c3b570643c..be26f787da6 100644
--- a/plugins/text-editor-assets/lang/es.json
+++ b/plugins/text-editor-assets/lang/es.json
@@ -65,6 +65,7 @@
     "SeeOriginalData": "Ver datos originales",
     "CategoryVersioning": "Control de versiones",
     "TableDiffLabel": "Cambios en la tabla",
+    "TableRefreshConfirmationLabel": "Confirmar actualización de tabla",
     "ConvertToLinkPreview": "Mostrar como enlace",
     "ConvertToEmbedPreview": "Mostrar como vista previa de contenido",
     "UnableToLoadEmbeddedContent": "No se pudo cargar la vista previa del enlace debido a la configuración de permisos o contenido no compatible",
diff --git a/plugins/text-editor-assets/lang/fr.json b/plugins/text-editor-assets/lang/fr.json
index 140cd368c25..7ae34f97167 100644
--- a/plugins/text-editor-assets/lang/fr.json
+++ b/plugins/text-editor-assets/lang/fr.json
@@ -65,6 +65,7 @@
     "SeeOriginalData": "Voir les données originales",
     "CategoryVersioning": "Gestion de versions",
     "TableDiffLabel": "Modifications du tableau",
+    "TableRefreshConfirmationLabel": "Confirmer l'actualisation du tableau",
     "ConvertToLinkPreview": "Afficher comme lien",
     "ConvertToEmbedPreview": "Afficher comme aperçu de contenu",
     "UnableToLoadEmbeddedContent": "L’aperçu du lien n’a pas pu être chargé en raison des paramètres d’autorisation ou d’un contenu non pris en charge",
diff --git a/plugins/text-editor-assets/lang/it.json b/plugins/text-editor-assets/lang/it.json
index 7eb6bf0f985..4cb6cbe401e 100644
--- a/plugins/text-editor-assets/lang/it.json
+++ b/plugins/text-editor-assets/lang/it.json
@@ -74,6 +74,7 @@
     "SeeOriginalData": "Vedi dati originali",
     "CategoryVersioning": "Versionamento",
     "TableDiffLabel": "Modifiche alla tabella",
+    "TableRefreshConfirmationLabel": "Conferma aggiornamento tabella",
     "ConvertToLinkPreview": "Mostra come link",
     "ConvertToEmbedPreview": "Mostra come anteprima del contenuto",
     "UnableToLoadEmbeddedContent": "Impossibile caricare l'anteprima del link a causa delle impostazioni dei permessi o di contenuto non supportato",
diff --git a/plugins/text-editor-assets/lang/ja.json b/plugins/text-editor-assets/lang/ja.json
index e7e368b214b..b702e98ffbd 100644
--- a/plugins/text-editor-assets/lang/ja.json
+++ b/plugins/text-editor-assets/lang/ja.json
@@ -75,6 +75,7 @@
     "SeeOriginalData": "元のデータを表示",
     "CategoryVersioning": "バージョン管理",
     "TableDiffLabel": "テーブルの変更",
+    "TableRefreshConfirmationLabel": "テーブルの更新を確認",
     "ConvertToLinkPreview": "リンクとして表示",
     "ConvertToEmbedPreview": "コンテンツプレビューとして表示",
     "UnableToLoadEmbeddedContent": "リンクのプレビューを読み込めません。権限設定または非対応のコンテンツが原因です",
diff --git a/plugins/text-editor-assets/lang/pt.json b/plugins/text-editor-assets/lang/pt.json
index d3879902d78..5edde03d641 100644
--- a/plugins/text-editor-assets/lang/pt.json
+++ b/plugins/text-editor-assets/lang/pt.json
@@ -65,6 +65,7 @@
     "SeeOriginalData": "Ver dados originais",
     "CategoryVersioning": "Versionamento",
     "TableDiffLabel": "Alterações na tabela",
+    "TableRefreshConfirmationLabel": "Confirmar atualização da tabela",
     "ConvertToLinkPreview": "Mostrar como link",
     "ConvertToEmbedPreview": "Mostrar como pré-visualização de conteúdo",
     "UnableToLoadEmbeddedContent": "Não foi possível carregar a pré-visualização do link devido às permissões ou a conteúdo não suportado",
diff --git a/plugins/text-editor-assets/lang/ru.json b/plugins/text-editor-assets/lang/ru.json
index 68fc4cf7eb6..f2ceb38d8da 100644
--- a/plugins/text-editor-assets/lang/ru.json
+++ b/plugins/text-editor-assets/lang/ru.json
@@ -75,6 +75,7 @@
     "SeeOriginalData": "Показать исходные данные",
     "CategoryVersioning": "Версионирование",
     "TableDiffLabel": "Изменения в таблице",
+    "TableRefreshConfirmationLabel": "Подтвердить обновление таблицы",
     "ConvertToLinkPreview": "Показать как ссылку",
     "ConvertToEmbedPreview": "Показать как превью контента",
     "UnableToLoadEmbeddedContent": "Не удалось загрузить превью ссылки из-за настроек доступа или неподдерживаемого содержимого",
diff --git a/plugins/text-editor-assets/lang/tr.json b/plugins/text-editor-assets/lang/tr.json
index 7a8c66bba8a..d9bc887f103 100644
--- a/plugins/text-editor-assets/lang/tr.json
+++ b/plugins/text-editor-assets/lang/tr.json
@@ -75,6 +75,7 @@
     "SeeOriginalData": "Orijinal verileri görüntüle",
     "CategoryVersioning": "Sürümleme",
     "TableDiffLabel": "Tablo değişiklikleri",
+    "TableRefreshConfirmationLabel": "Tablo yenilemeyi onayla",
     "ConvertToLinkPreview": "Bağlantı olarak göster",
     "ConvertToEmbedPreview": "İçerik önizlemesi olarak göster",
     "UnableToLoadEmbeddedContent": "Bağlantı önizlemesi izin ayarları veya desteklenmeyen içerik nedeniyle yüklenemedi",
diff --git a/plugins/text-editor-assets/lang/zh.json b/plugins/text-editor-assets/lang/zh.json
index 287bf737d8e..ba248338391 100644
--- a/plugins/text-editor-assets/lang/zh.json
+++ b/plugins/text-editor-assets/lang/zh.json
@@ -67,6 +67,7 @@
     "SeeOriginalData": "查看原始数据",
     "CategoryVersioning": "版本控制",
     "TableDiffLabel": "表格变更",
+    "TableRefreshConfirmationLabel": "确认表格刷新",
     "ConvertToLinkPreview": "显示为链接",
     "ConvertToEmbedPreview": "显示为内容预览",
     "UnableToLoadEmbeddedContent": "由于权限设置或不支持的内容，无法加载链接预览",
diff --git a/plugins/text-editor-resources/src/components/extension/table/actions/TableRefreshConfirmation.svelte b/plugins/text-editor-resources/src/components/extension/table/actions/TableRefreshConfirmation.svelte
new file mode 100644
index 00000000000..f296b9b5cf1
--- /dev/null
+++ b/plugins/text-editor-resources/src/components/extension/table/actions/TableRefreshConfirmation.svelte
@@ -0,0 +1,67 @@
+<!--
+//
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+-->
+<script lang="ts">
+  import { markdownToMarkup } from '@hcengineering/text-markdown'
+  import presentation, { Card } from '@hcengineering/presentation'
+  import textEditor from '@hcengineering/text-editor'
+  import { Button } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+
+  import MarkupDiffViewer from '../../../MarkupDiffViewer.svelte'
+
+  export let oldMarkdown: string
+  export let newMarkdown: string
+  export let onApply: () => void = () => {}
+
+  const dispatch = createEventDispatcher()
+
+  // Convert markdown strings to MarkupNode for structured diffing
+  $: oldContent = markdownToMarkup(oldMarkdown)
+  $: newContent = markdownToMarkup(newMarkdown)
+
+  function handleApply (): void {
+    onApply()
+    dispatch('close')
+  }
+
+  function handleCancel (): void {
+    dispatch('close')
+  }
+</script>
+
+<Card
+  label={textEditor.string.TableRefreshConfirmationLabel}
+  fullSize={true}
+  canSave={true}
+  okAction={handleApply}
+  onCancel={handleCancel}
+  on:close={handleCancel}
+>
+  <div class="table-diff-container">
+    <MarkupDiffViewer content={newContent} comparedVersion={oldContent} />
+  </div>
+  <svelte:fragment slot="buttons">
+    <Button label={presentation.string.Cancel} kind="secondary" size="large" on:click={handleCancel} />
+  </svelte:fragment>
+</Card>
+
+<style>
+  .table-diff-container {
+    padding: 1rem;
+    overflow: auto;
+    max-height: 80vh;
+  }
+</style>
diff --git a/plugins/text-editor-resources/src/components/extension/table/actions/refreshTable.ts b/plugins/text-editor-resources/src/components/extension/table/actions/refreshTable.ts
index cfaf3c64b92..da0a8de8f37 100644
--- a/plugins/text-editor-resources/src/components/extension/table/actions/refreshTable.ts
+++ b/plugins/text-editor-resources/src/components/extension/table/actions/refreshTable.ts
@@ -15,82 +15,24 @@
 import { type Editor } from '@tiptap/core'
 import { Node } from '@tiptap/pm/model'
 import { markdownToMarkup } from '@hcengineering/text-markdown'
-import { getClient } from '@hcengineering/presentation'
-import { buildMarkdownTableFromDocs } from '../refreshTable'
+import { showPopup } from '@hcengineering/ui'
 import { findTable } from '../utils'
 import { getTableMetadata } from '../tableMetadata'
+import TableRefreshConfirmation from './TableRefreshConfirmation.svelte'
+import { extractTableMarkdown, fetchFreshTableData } from './tableUtils'
 
 /**
- * Refresh a table by re-executing its query and rebuilding the table content
+ * Apply the refreshed table to the editor
  */
-export async function refreshTable (editor: Editor): Promise<void> {
-  const table = findTable(editor.state.selection)
-  if (table === undefined) {
-    console.warn('No table found to refresh')
-    return
-  }
-
-  const metadata = getTableMetadata(table.node)
-  if (metadata === null || metadata === undefined) {
-    console.warn('Table has no metadata to refresh')
-    return
-  }
-
+function applyTableRefresh (
+  editor: Editor,
+  table: { node: Node, pos: number },
+  freshTableMarkdown: string,
+  metadata: any
+): void {
   try {
-    const client = getClient()
-    const hierarchy = client.getHierarchy()
-
-    // Convert string cardClass to Ref<Class<Doc>> and validate
-    const cardClassRef = metadata.cardClass as any
-    const cardClass = hierarchy.getClass(cardClassRef)
-    if (cardClass == null) {
-      console.warn('Invalid cardClass in table metadata:', metadata.cardClass)
-      return
-    }
-
-    // Build query: use documentIds as filter if available (preserves selected docs), otherwise use query
-    let query: any
-    let useDocumentIdsOrder = false
-    if (metadata.documentIds !== undefined && metadata.documentIds.length > 0) {
-      // Build query from document IDs (preserves selected docs filter)
-      query = { ...(metadata?.query ?? {}), _id: { $in: metadata.documentIds } }
-      useDocumentIdsOrder = true
-    } else if (metadata.query !== null && metadata.query !== undefined) {
-      query = metadata.query
-    } else {
-      console.warn('Table metadata has no query or documentIds to execute')
-      return
-    }
-
-    // Execute query to fetch fresh documents
-    let docs = await client.findAll(cardClassRef, query)
-
-    // Sort by documentIds order if query was built from documentIds
-    if (useDocumentIdsOrder && metadata.documentIds !== undefined) {
-      const idIndexMap = new Map(metadata.documentIds.map((id, index) => [id, index]))
-      docs = docs.sort((a, b) => {
-        const indexA = idIndexMap.get(a._id) ?? Infinity
-        const indexB = idIndexMap.get(b._id) ?? Infinity
-        return indexA - indexB
-      })
-    }
-
-    if (docs.length === 0) {
-      console.warn('Query returned no documents')
-      // Optionally show empty table or keep existing
-      return
-    }
-
-    // Build markdown table from fresh documents
-    const markdown = await buildMarkdownTableFromDocs(docs, metadata, client)
-
-    if (markdown.length === 0) {
-      console.warn('Failed to build markdown table')
-      return
-    }
-
     // Convert markdown to ProseMirror nodes
-    const markupNode = markdownToMarkup(markdown)
+    const markupNode = markdownToMarkup(freshTableMarkdown)
     const content = Node.fromJSON(editor.state.schema, markupNode)
 
     // Find the table node in the parsed content
@@ -108,7 +50,6 @@ export async function refreshTable (editor: Editor): Promise<void> {
     }
 
     // Preserve metadata in the new table node
-    // TypeScript needs explicit type assertion here
     const tableNode: Node = newTableNode
     const metadataAttr = JSON.stringify(metadata)
     const newAttrs = { ...tableNode.attrs, tableMetadata: metadataAttr }
@@ -120,8 +61,53 @@ export async function refreshTable (editor: Editor): Promise<void> {
 
     // Dispatch the transaction
     editor.view.dispatch(tr)
+  } catch (error) {
+    console.error('Failed to apply table refresh:', error)
+  }
+}
+
+/**
+ * Refresh a table by re-executing its query and rebuilding the table content
+ * Shows a confirmation modal with diff before applying changes
+ */
+export async function refreshTable (editor: Editor): Promise<void> {
+  const table = findTable(editor.state.selection)
+  if (table === undefined) {
+    console.warn('No table found to refresh')
+    return
+  }
+
+  const metadata = getTableMetadata(table.node)
+  if (metadata === null || metadata === undefined) {
+    console.warn('Table has no metadata to refresh')
+    return
+  }
+
+  try {
+    const currentTableMarkdown = extractTableMarkdown(table.node)
+
+    const freshTableMarkdown = await fetchFreshTableData(metadata)
+    if (freshTableMarkdown === null) {
+      return
+    }
+
+    await new Promise<void>((resolve) => {
+      showPopup(
+        TableRefreshConfirmation,
+        {
+          oldMarkdown: currentTableMarkdown,
+          newMarkdown: freshTableMarkdown,
+          onApply: () => {
+            applyTableRefresh(editor, table, freshTableMarkdown, metadata)
+          }
+        },
+        'center',
+        () => {
+          resolve()
+        }
+      )
+    })
   } catch (error) {
     console.error('Failed to refresh table:', error)
-    // Error is logged, user can retry if needed
   }
 }
diff --git a/plugins/text-editor-resources/src/components/extension/table/actions/showTableDiff.ts b/plugins/text-editor-resources/src/components/extension/table/actions/showTableDiff.ts
index 6926deedcf2..dcaa1012fcc 100644
--- a/plugins/text-editor-resources/src/components/extension/table/actions/showTableDiff.ts
+++ b/plugins/text-editor-resources/src/components/extension/table/actions/showTableDiff.ts
@@ -13,69 +13,11 @@
 //
 
 import { type Editor } from '@tiptap/core'
-import { type Node } from '@tiptap/pm/model'
-import { TableMap } from '@tiptap/pm/tables'
-import { getClient } from '@hcengineering/presentation'
 import { showPopup } from '@hcengineering/ui'
-import { buildMarkdownTableFromDocs } from '../refreshTable'
 import { findTable } from '../utils'
 import { getTableMetadata } from '../tableMetadata'
 import TableDiffViewer from './TableDiffViewer.svelte'
-
-/**
- * Extract markdown string from a ProseMirror table node
- */
-function extractTableMarkdown (tableNode: Node): string {
-  try {
-    const map = TableMap.get(tableNode)
-    const { width, height } = map
-
-    // Track visited cells to handle rowspan/colspan
-    const visitedCells = new Set<number>()
-    const rows: string[][] = []
-
-    // Extract all rows
-    for (let row = 0; row < height; row++) {
-      const rowCells: string[] = []
-      for (let col = 0; col < width; col++) {
-        const pos = map.map[row * width + col]
-        if (!visitedCells.has(pos)) {
-          const cell = tableNode.nodeAt(pos)
-          if (cell !== null) {
-            rowCells.push(cell.textContent.trim() ?? '')
-          } else {
-            rowCells.push('')
-          }
-          visitedCells.add(pos)
-        } else {
-          // Cell already processed (rowspan/colspan), use empty or previous value
-          rowCells.push('')
-        }
-      }
-      rows.push(rowCells)
-    }
-
-    if (rows.length === 0) {
-      return ''
-    }
-
-    // Build markdown table
-    // First row is headers
-    const headerRow = rows[0]
-    let markdown = '| ' + headerRow.join(' | ') + ' |\n'
-    markdown += '| ' + headerRow.map(() => '---').join(' | ') + ' |\n'
-
-    // Data rows
-    for (let i = 1; i < rows.length; i++) {
-      markdown += '| ' + rows[i].join(' | ') + ' |\n'
-    }
-
-    return markdown
-  } catch (error) {
-    console.warn('Failed to extract table markdown:', error)
-    return ''
-  }
-}
+import { extractTableMarkdown, fetchFreshTableData } from './tableUtils'
 
 /**
  * Show diff between current table content and fresh data from database
@@ -97,55 +39,9 @@ export async function showTableDiff (editor: Editor): Promise<void> {
     // Extract current table as markdown
     const currentTableMarkdown = extractTableMarkdown(table.node)
 
-    // Generate fresh table version using the same logic as refreshTable
-    const client = getClient()
-    const hierarchy = client.getHierarchy()
-
-    // Convert string cardClass to Ref<Class<Doc>> and validate
-    const cardClassRef = metadata.cardClass as any
-    const cardClass = hierarchy.getClass(cardClassRef)
-    if (cardClass == null) {
-      console.warn('Invalid cardClass in table metadata:', metadata.cardClass)
-      return
-    }
-
-    // Build query: use existing query if available, otherwise build from documentIds
-    let query: any
-    let useDocumentIdsOrder = false
-    if (metadata.documentIds !== undefined && metadata.documentIds.length > 0) {
-      // Build query from document IDs
-      query = { ...(metadata?.query ?? {}), _id: { $in: metadata.documentIds } }
-      useDocumentIdsOrder = true
-    } else if (metadata.query !== null && metadata.query !== undefined) {
-      query = metadata.query
-    } else {
-      console.warn('Table metadata has no query or documentIds to execute')
-      return
-    }
-
-    // Execute query to fetch fresh documents
-    let docs = await client.findAll(cardClassRef, query)
-
-    // Sort by documentIds order if query was built from documentIds
-    if (useDocumentIdsOrder && metadata.documentIds !== undefined) {
-      const idIndexMap = new Map(metadata.documentIds.map((id, index) => [id, index]))
-      docs = docs.sort((a, b) => {
-        const indexA = idIndexMap.get(a._id) ?? Infinity
-        const indexB = idIndexMap.get(b._id) ?? Infinity
-        return indexA - indexB
-      })
-    }
-
-    if (docs.length === 0) {
-      console.warn('Query returned no documents')
-      return
-    }
-
-    // Build markdown table from fresh documents
-    const freshTableMarkdown = await buildMarkdownTableFromDocs(docs, metadata, client)
-
-    if (freshTableMarkdown.length === 0) {
-      console.warn('Failed to build markdown table')
+    // Fetch fresh table data from database
+    const freshTableMarkdown = await fetchFreshTableData(metadata)
+    if (freshTableMarkdown === null) {
       return
     }
 
diff --git a/plugins/text-editor-resources/src/components/extension/table/actions/tableUtils.ts b/plugins/text-editor-resources/src/components/extension/table/actions/tableUtils.ts
new file mode 100644
index 00000000000..ab9c9f73176
--- /dev/null
+++ b/plugins/text-editor-resources/src/components/extension/table/actions/tableUtils.ts
@@ -0,0 +1,124 @@
+//
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { type Node } from '@tiptap/pm/model'
+import { TableMap } from '@tiptap/pm/tables'
+import type { Client } from '@hcengineering/core'
+import { getClient } from '@hcengineering/presentation'
+import { buildMarkdownTableFromDocs } from '../refreshTable'
+import type { TableMetadata } from '../tableMetadata'
+
+/**
+ * Extract markdown string from a ProseMirror table node
+ */
+export function extractTableMarkdown (tableNode: Node): string {
+  try {
+    const map = TableMap.get(tableNode)
+    const { width, height } = map
+
+    // Track visited cells to handle rowspan/colspan
+    const visitedCells = new Set<number>()
+    const rows: string[][] = []
+
+    for (let row = 0; row < height; row++) {
+      const rowCells: string[] = []
+      for (let col = 0; col < width; col++) {
+        const pos = map.map[row * width + col]
+        if (!visitedCells.has(pos)) {
+          const cell = tableNode.nodeAt(pos)
+          if (cell !== null) {
+            rowCells.push(cell.textContent.trim() ?? '')
+          } else {
+            rowCells.push('')
+          }
+          visitedCells.add(pos)
+        } else {
+          rowCells.push('')
+        }
+      }
+      rows.push(rowCells)
+    }
+
+    if (rows.length === 0) {
+      return ''
+    }
+
+    const headerRow = rows[0]
+    let markdown = '| ' + headerRow.join(' | ') + ' |\n'
+    markdown += '| ' + headerRow.map(() => '---').join(' | ') + ' |\n'
+
+    for (let i = 1; i < rows.length; i++) {
+      markdown += '| ' + rows[i].join(' | ') + ' |\n'
+    }
+
+    return markdown
+  } catch (error) {
+    console.warn('Failed to extract table markdown:', error)
+    return ''
+  }
+}
+
+/**
+ * Fetch fresh table data from the database based on table metadata
+ * Returns the fresh markdown table string
+ */
+export async function fetchFreshTableData (metadata: TableMetadata, client?: Client): Promise<string | null> {
+  const _client = client ?? getClient()
+  const hierarchy = _client.getHierarchy()
+
+  const cardClassRef = metadata.cardClass as any
+  const cardClass = hierarchy.getClass(cardClassRef)
+  if (cardClass == null) {
+    console.warn('Invalid cardClass in table metadata:', metadata.cardClass)
+    return null
+  }
+
+  // Build query: use documentIds as filter if available (preserves selected docs), otherwise use query
+  let query: any
+  let useDocumentIdsOrder = false
+  if (metadata.documentIds !== undefined && metadata.documentIds.length > 0) {
+    query = { ...(metadata?.query ?? {}), _id: { $in: metadata.documentIds } }
+    useDocumentIdsOrder = true
+  } else if (metadata.query !== null && metadata.query !== undefined) {
+    query = metadata.query
+  } else {
+    console.warn('Table metadata has no query or documentIds to execute')
+    return null
+  }
+
+  let docs = await _client.findAll(cardClassRef, query)
+
+  if (useDocumentIdsOrder && metadata.documentIds !== undefined) {
+    const idIndexMap = new Map(metadata.documentIds.map((id, index) => [id, index]))
+    docs = docs.sort((a, b) => {
+      const indexA = idIndexMap.get(a._id) ?? Infinity
+      const indexB = idIndexMap.get(b._id) ?? Infinity
+      return indexA - indexB
+    })
+  }
+
+  if (docs.length === 0) {
+    console.warn('Query returned no documents')
+    return null
+  }
+
+  const freshTableMarkdown = await buildMarkdownTableFromDocs(docs, metadata, _client)
+
+  if (freshTableMarkdown.length === 0) {
+    console.warn('Failed to build markdown table')
+    return null
+  }
+
+  return freshTableMarkdown
+}
diff --git a/plugins/text-editor/src/plugin.ts b/plugins/text-editor/src/plugin.ts
index d5a152054f7..e8e4e7dcd54 100644
--- a/plugins/text-editor/src/plugin.ts
+++ b/plugins/text-editor/src/plugin.ts
@@ -113,6 +113,7 @@ export default plugin(textEditorId, {
     SeeOriginalData: '' as IntlString,
     CategoryVersioning: '' as IntlString,
     TableDiffLabel: '' as IntlString,
+    TableRefreshConfirmationLabel: '' as IntlString,
 
     ConvertToLinkPreview: '' as IntlString,
     ConvertToEmbedPreview: '' as IntlString,