diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx
index 1083422a..5a34c8ad 100644
--- a/src/components/EditorHeader/ControlPanel.jsx
+++ b/src/components/EditorHeader/ControlPanel.jsx
@@ -326,7 +326,7 @@ export default function ControlPanel({
 
     if (a.action === Action.ADD) {
       if (a.element === ObjectType.TABLE) {
-        addTable(null, false);
+        addTable(null, false, a.id);
       } else if (a.element === ObjectType.AREA) {
         addArea(null, false);
       } else if (a.element === ObjectType.NOTE) {
diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsx
index b554cb2b..804dcc9b 100644
--- a/src/context/DiagramContext.jsx
+++ b/src/context/DiagramContext.jsx
@@ -16,8 +16,8 @@ export default function DiagramContextProvider({ children }) {
   const { setUndoStack, setRedoStack } = useUndoRedo();
   const { selectedElement, setSelectedElement } = useSelect();
 
-  const addTable = (data, addToHistory = true) => {
-    const id = nanoid();
+  const addTable = (data, addToHistory = true, idToUse = null) => {
+    const id = idToUse || nanoid();
     if (data) {
       setTables((prev) => {
         const temp = prev.slice();