1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index a9474fe93..75c178136 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -276,6 +276,7 @@ export class CollectionDockingView extends CollectionSubView() {
         return true;
     }
     setupGoldenLayout = async () => {
+        if (this._unmounting) return;
         //const config = StrCast(this._props.Document.dockingConfig, JSON.stringify(DashboardView.resetDashboard(this._props.Document)));
         const config = StrCast(this._props.Document.dockingConfig);
         if (config) {
@@ -313,6 +314,7 @@ export class CollectionDockingView extends CollectionSubView() {
     };
 
     componentDidMount: () => void = async () => {
+        this._unmounting = false;
         if (this._containerRef.current) {
             this._lightboxReactionDisposer = reaction(
                 () => LightboxView.LightboxDoc,
@@ -347,7 +349,9 @@ export class CollectionDockingView extends CollectionSubView() {
         }
     };
 
+    _unmounting = false;
     componentWillUnmount: () => void = () => {
+        this._unmounting = true;
         try {
             this._goldenLayout.unbind('stackCreated', this.stackCreated);
             this._goldenLayout.unbind('tabDestroyed', this.tabDestroyed);