diff --git a/src/components/DockBuilder/DockBuilder.jsx b/src/components/DockBuilder/DockBuilder.jsx
index d1aa6ca..d92c7cc 100644
--- a/src/components/DockBuilder/DockBuilder.jsx
+++ b/src/components/DockBuilder/DockBuilder.jsx
@@ -497,7 +497,12 @@ export const DockBuilder = () => {
   }, [editor, selectedItems]);
 
   const onUndoClick = useCallback(() => {
-    // TODO: Undo
+    const undoResult = stack.undo();
+    if (undoResult && undoResult.currentState) {
+      editorMemo.loadFromJSON(undoResult.currentState, () => {
+        editorMemo.renderAll();
+      });
+    }
   }, [editorMemo]);
 
   const onRedoClick = useCallback(() => {