1 files changed, 7 insertions, 7 deletions
diff --git a/src/client/views/DocComponent.tsx b/src/client/views/DocComponent.tsx
index e351e2dec..064906530 100644
--- a/src/client/views/DocComponent.tsx
+++ b/src/client/views/DocComponent.tsx
@@ -5,7 +5,7 @@ import { DateField } from '../../fields/DateField';
 import { Doc, DocListCast, Opt } from '../../fields/Doc';
 import { AclAdmin, AclAugment, AclEdit, AclPrivate, AclReadonly, DocData } from '../../fields/DocSymbols';
 import { List } from '../../fields/List';
-import { toList } from '../../fields/Types';
+import { DocCast, toList } from '../../fields/Types';
 import { GetEffectiveAcl, inheritParentAcls } from '../../fields/util';
 import { DocumentType } from '../documents/DocumentTypes';
 import { ObservableReactComponent } from './ObservableReactComponent';
@@ -35,14 +35,14 @@ export function DocComponent<P extends DocComponentProps>() {
          * Rather, it specifies the shared properties of all layouts of the document (eg, x,y,)
          */
         get Document() {
-            return this._props.Document;
+            return DocCast(this._props.Document.rootDocument, this._props.Document);
         }
 
         /**
          * This is the document being rendered.  It may be a template so it may or may no inherit from the data doc.
          */
         @computed get layoutDoc() {
-            return this._props.LayoutTemplateString ? this.Document : Doc.Layout(this.Document, this._props.LayoutTemplate?.());
+            return this._props.LayoutTemplateString ? this.Document : Doc.Layout(this._props.Document, this._props.LayoutTemplate?.());
         }
 
         /**
@@ -80,13 +80,13 @@ export function ViewBoxBaseComponent<P extends FieldViewProps>() {
          * Rather, it specifies the shared properties of all layouts of the document (eg, x,y,)
          */
         get Document() {
-            return this._props.Document;
+            return DocCast(this._props.Document.rootDocument, this._props.Document);
         }
         /**
          * This is the document being rendered.  It may be a template so it may or may no inherit from the data doc.
          */
         @computed get layoutDoc() {
-            return Doc.Layout(this.Document);
+            return Doc.Layout(this._props.Document);
         }
 
         /**
@@ -138,13 +138,13 @@ export function ViewBoxAnnotatableComponent<P extends FieldViewProps>() {
          * Rather, it specifies the shared properties of all layouts of the document (eg, x,y,)
          */
         @computed get Document() {
-            return this._props.Document;
+            return DocCast(this._props.Document.rootDocument, this._props.Document);
         }
         /**
          * This is the document being rendered.  It may be a template so it may or may no inherit from the data doc.
          */
         @computed get layoutDoc() {
-            return Doc.Layout(this.Document);
+            return Doc.Layout(this._props.Document);
         }
 
         /**