1 files changed, 5 insertions, 3 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 0c7504913..8879bd194 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -180,7 +180,7 @@ export class Doc extends RefField {
         return DocCast(Doc.UserDoc().myRecentlyClosed);
     }
     public static get MyTrails() {
-        return DocCast(Doc.UserDoc().myTrails);
+        return DocCast(Doc.ActiveDashboard?.myTrails);
     }
     public static get MyOverlayDocs() {
         return DocCast(Doc.UserDoc().myOverlayDocs);
@@ -225,10 +225,12 @@ export class Doc extends RefField {
         return StrCast(Doc.UserDoc().activeTool, InkTool.None) as InkTool;
     }
     public static get ActivePresentation() {
-        return DocCast(Doc.UserDoc().activePresentation);
+        return DocCast(Doc.ActiveDashboard?.activePresentation);
     }
     public static set ActivePresentation(val) {
-        Doc.UserDoc().activePresentation = val;
+      if (Doc.ActiveDashboard) {
+            Doc.ActiveDashboard.activePresentation = val;
+      }
     }
     constructor(id?: FieldId, forceSave?: boolean) {
         super(id);