conflicts

2 files changed, 4 insertions, 6 deletions

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 660790b11..ec5cb8a61 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -950,7 +950,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P
                 doc.hidden && Doc.UnHighlightDoc(doc);
                 const resetView = options?.afterFocus ? await options?.afterFocus(moved) : ViewAdjustment.doNothing;
                 if (resetView) {
-                    const restoreState = !LightboxView.LightboxDoc || LightboxView.LightboxDoc === this.props.Document && savedState;
+                    const restoreState = (!LightboxView.LightboxDoc || LightboxView.LightboxDoc === this.props.Document) && savedState;
                     if (typeof restoreState !== "boolean") {
                         this.Document._panX = restoreState.panX;
                         this.Document._panY = restoreState.panY;
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index 2a30e5fd0..e625b5b4b 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -323,11 +323,9 @@ export class MarqueeView extends React.Component<SubCollectionViewProps & Marque
             if (Doc.GetSelectedTool() === InkTool.None) {
                 if (!(e.nativeEvent as any).marqueeHit) {
                     (e.nativeEvent as any).marqueeHit = true;
-                    if (!(e.nativeEvent as any).formattedHandled) {
-                        if (!this.props.trySelectCluster(e.shiftKey)) {
-                            this.setPreviewCursor(e.clientX, e.clientY, false);
-                        } else e.stopPropagation();
-                    }
+                    if (!this.props.trySelectCluster(e.shiftKey)) {
+                        this.setPreviewCursor(e.clientX, e.clientY, false);
+                    } else e.stopPropagation();
                 }
             }
             // let the DocumentView stopPropagation of this event when it selects this document