1 files changed, 8 insertions, 5 deletions
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 0a00ab6e0..ad6d90bc3 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -5,6 +5,7 @@ import { Cast } from '../../fields/Types';
 import { returnFalse } from '../../Utils';
 import { DocumentType } from '../documents/DocumentTypes';
 import { CollectionDockingView } from '../views/collections/CollectionDockingView';
+import { CollectionFreeFormView } from '../views/collections/collectionFreeForm';
 import { CollectionView } from '../views/collections/CollectionView';
 import { LightboxView } from '../views/LightboxView';
 import { DocumentView, ViewAdjustment } from '../views/nodes/DocumentView';
@@ -252,10 +253,11 @@ export class DocumentManager {
     }
 
 }
-ScriptingGlobals.add(function DocFocusOrOpen(doc: any) {
-    const dv = DocumentManager.Instance.getDocumentView(doc);
-    if (dv && dv.props.Document === doc) {
-        dv.props.focus(doc, { willZoom: true });
+export function DocFocusOrOpen(doc: any, collectionDoc?: Doc) {
+    const cv = collectionDoc && DocumentManager.Instance.getDocumentView(collectionDoc);
+    const dv = DocumentManager.Instance.getDocumentView(doc, (cv?.ComponentView as CollectionFreeFormView)?.props.CollectionView);
+    if (dv && Doc.AreProtosEqual(dv.props.Document, doc)) {
+        dv.props.focus(dv.props.Document, { willZoom: true });
         Doc.linkFollowHighlight(dv?.props.Document, false);
     }
     else {
@@ -264,4 +266,5 @@ ScriptingGlobals.add(function DocFocusOrOpen(doc: any) {
         CollectionDockingView.AddSplit(showDoc === Doc.GetProto(showDoc) ? Doc.MakeAlias(showDoc) : showDoc, "right") && context &&
             setTimeout(() => DocumentManager.Instance.getDocumentView(Doc.GetProto(doc))?.focus(doc));
     }
-});
-\ No newline at end of file
+}
+ScriptingGlobals.add(DocFocusOrOpen);
+\ No newline at end of file