diff --git a/src/viewport-three/ViewportPanel.tsx b/src/viewport-three/ViewportPanel.tsx
index 39fb2532..c08dfb74 100644
--- a/src/viewport-three/ViewportPanel.tsx
+++ b/src/viewport-three/ViewportPanel.tsx
@@ -61,6 +61,7 @@ interface ViewportPanelProps {
   whiteboxSnapStep: number;
   viewportGridVisible: boolean;
   selection: EditorSelection;
+  activeSelectionId: string | null;
   toolMode: ToolMode;
   toolPreview: ViewportToolPreview;
   transformSession: TransformSessionState;
@@ -132,6 +133,7 @@ export function ViewportPanel({
   whiteboxSnapStep,
   viewportGridVisible,
   selection,
+  activeSelectionId,
   toolMode,
   toolPreview,
   transformSession,
@@ -191,6 +193,7 @@ export function ViewportPanel({
         whiteboxSnapStep={whiteboxSnapStep}
         viewportGridVisible={viewportGridVisible}
         selection={selection}
+        activeSelectionId={activeSelectionId}
         toolMode={toolMode}
         toolPreview={toolPreview}
         transformSession={transformSession}
diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index 75c3b1df..665b49e1 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -925,7 +925,11 @@ export class ViewportHost {
     this.applyWorld();
 
     if (this.currentDocument !== null) {
-      this.updateDocument(this.currentDocument, this.currentSelection);
+      this.updateDocument(
+        this.currentDocument,
+        this.currentSelection,
+        this.currentActiveSelectionId
+      );
     }
   }