2 files changed, 7 insertions, 7 deletions
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index fd9bcf681..632abd6cf 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -177,7 +177,6 @@ export class CollectionSchemaView extends CollectionSubView() {
 
     addRow = (doc: Doc | Doc[]) => {
         const result: boolean = this.addDocument(doc);
-        this.setSort(this.sortField, this.sortDesc);
         return result;
     };
 
@@ -355,7 +354,6 @@ export class CollectionSchemaView extends CollectionSubView() {
             const pushedAndDraggedDocs = [...pushedDocs, ...draggedDocs];
             const removed = this.childDocs.slice().filter(doc => !pushedAndDraggedDocs.includes(doc));
             this.dataDoc[this.fieldKey ?? 'data'] = new List<Doc>([...removed, ...draggedDocs, ...pushedDocs]);
-            this.setSort(undefined);
             SelectionManager.DeselectAll();
             draggedDocs.forEach(doc => {
                 const draggedView = DocumentManager.Instance.getFirstDocumentView(doc);
@@ -371,7 +369,6 @@ export class CollectionSchemaView extends CollectionSubView() {
     @action
     onExternalDrop = async (e: React.DragEvent): Promise<void> => {
         super.onExternalDrop(e, {}, undoBatch(action(docus => docus.map((doc: Doc) => this.addDocument(doc)))));
-        this.setSort(undefined);
     };
 
     onDividerDown = (e: React.PointerEvent) => setupMoveUpEvents(this, e, this.onDividerMove, emptyFunction, emptyFunction);
@@ -729,7 +726,7 @@ export class CollectionSchemaView extends CollectionSubView() {
         const desc = BoolCast(this.layoutDoc.sortDesc);
         const docs = !field
             ? this.childDocs
-            : this.childDocs.sort((docA, docB) => {
+            : [...this.childDocs].sort((docA, docB) => {
                   const aStr = Field.toString(docA[field] as Field);
                   const bStr = Field.toString(docB[field] as Field);
                   var out = 0;
@@ -874,6 +871,7 @@ class CollectionSchemaViewDocs extends React.Component<CollectionSchemaViewDocsP
                                 hideLinkAnchors={true}
                                 fitWidth={returnTrue}
                                 scriptContext={this}
+                                canEmbedOnDrag={true}
                             />
                         </div>
                     );
diff --git a/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx b/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx
index d88d67c94..b133347cf 100644
--- a/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx
@@ -12,7 +12,7 @@ export interface SchemaColumnHeaderProps {
     columnIndex: number;
     sortField: string;
     sortDesc: boolean;
-    setSort: (field: string, desc: boolean) => void;
+    setSort: (field: string | undefined, desc?: boolean) => void;
     removeColumn: (index: number) => void;
     resizeColumn: (e: any, index: number) => void;
     dragColumn: (e: any, index: number) => boolean;
@@ -30,8 +30,10 @@ export class SchemaColumnHeader extends React.Component<SchemaColumnHeaderProps>
     sortClicked = (e: React.PointerEvent) => {
         e.stopPropagation();
         e.preventDefault();
-        if (this.props.sortField == this.fieldKey) {
-            this.props.setSort(this.fieldKey, !this.props.sortDesc);
+        if (this.props.sortField == this.fieldKey && this.props.sortDesc) {
+            this.props.setSort(undefined);
+        } else if (this.props.sortField == this.fieldKey) {
+            this.props.setSort(this.fieldKey, true);
         } else {
             this.props.setSort(this.fieldKey, false);
         }