1 files changed, 9 insertions, 3 deletions
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index fb6bc67d8..3f0848d00 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -25,7 +25,13 @@ export class DocumentManager {
     @observable public RecordingEvent = 0;
     @observable public LinkedDocumentViews: { a: DocumentView; b: DocumentView; l: Doc }[] = [];
     @computed public get DocumentViews() {
-        return Array.from(this._documentViews).filter(view => !(view.ComponentView instanceof KeyValueBox));
+        return Array.from(this._documentViews).filter(view => !(view.ComponentView instanceof KeyValueBox) && (!LightboxView.LightboxDoc || LightboxView.IsLightboxDocView(view.docViewPath)));
+    }
+    public AddDocumentView(dv: DocumentView) {
+        this._documentViews.add(dv);
+    }
+    public DeleteDocumentView(dv: DocumentView) {
+        this._documentViews.delete(dv);
     }
 
     private static _instance: DocumentManager;
@@ -83,7 +89,7 @@ export class DocumentManager {
             // this.LinkedDocumentViews.forEach(view => console.log("  LV = " + view.a.props.Document.title + "/" + view.a.props.LayoutTemplateString + " --> " +
             //     view.b.props.Document.title + "/" + view.b.props.LayoutTemplateString));
         } else {
-            this._documentViews.add(view);
+            this.AddDocumentView(view);
         }
         this.callAddViewFuncs(view);
     };
@@ -101,7 +107,7 @@ export class DocumentManager {
             const index = this.LinkAnchorBoxViews.indexOf(view);
             this.LinkAnchorBoxViews.splice(index, 1);
         } else {
-            this._documentViews.delete(view);
+            this.DeleteDocumentView(view);
         }
         SelectionManager.DeselectView(view);
     });