diff --git a/src/viewport-three/ViewportCanvas.tsx b/src/viewport-three/ViewportCanvas.tsx
index d07e506d..01d8ddd6 100644
--- a/src/viewport-three/ViewportCanvas.tsx
+++ b/src/viewport-three/ViewportCanvas.tsx
@@ -146,8 +146,17 @@ export function ViewportCanvas({
   }, [onSelectionChange]);
 
   useEffect(() => {
-    hostRef.current?.setCreationPreviewChangeHandler(onToolPreviewChange);
-  }, [onToolPreviewChange]);
+    hostRef.current?.setCreationPreviewChangeHandler((nextToolPreview) => {
+      onToolPreviewChange(
+        nextToolPreview.kind === "create"
+          ? {
+              ...nextToolPreview,
+              sourcePanelId: panelId
+            }
+          : nextToolPreview
+      );
+    });
+  }, [onToolPreviewChange, panelId]);
 
   useEffect(() => {
     hostRef.current?.setToolMode(toolMode);