Merge branch 'master' into trails-aubrey

1 files changed, 3 insertions, 2 deletions

diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index e507ec3bf..2cba2c1f2 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -27,7 +27,7 @@ export namespace SelectionManager {
 
                 manager.SelectedViews.set(docView, docView.rootDoc);
                 docView.props.whenChildContentsActiveChanged(true);
-            } else if (!ctrlPressed && Array.from(manager.SelectedViews.entries()).length > 1) {
+            } else if (!ctrlPressed && (Array.from(manager.SelectedViews.entries()).length > 1 || manager.SelectedSchemaDocument)) {
                 Array.from(manager.SelectedViews.keys()).map(dv => dv !== docView && dv.props.whenChildContentsActiveChanged(false));
                 manager.SelectedSchemaDocument = undefined;
                 manager.SelectedViews.clear();
@@ -57,7 +57,8 @@ export namespace SelectionManager {
     export function SelectView(docView: DocumentView, ctrlPressed: boolean): void {
         manager.SelectView(docView, ctrlPressed);
     }
-    export function SelectSchemaViewDoc(document: Opt<Doc>): void {
+    export function SelectSchemaViewDoc(document: Opt<Doc>, deselectAllFirst?: boolean): void {
+        if (deselectAllFirst) manager.DeselectAll();
         manager.SelectSchemaViewDoc(document);
     }