2 files changed, 8 insertions, 7 deletions
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index cf9ced849..5c28d8969 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -292,9 +292,9 @@ export class CollectionStackingView extends CollectionSubView<StackingDocument,
             });
             const oldDocs = this.childDocs.length;
             if (super.onInternalDrop(e, de)) {
-                const newDocs = this.childDocs.slice().filter((d: Doc, ind: number) => ind >= oldDocs);
+                const droppedDocs = this.childDocs.slice().filter((d: Doc, ind: number) => ind >= oldDocs); // dropping a document that wasn't in the list or one that creates something new (eg., a button that creates a note) adds a document to the end of the list
+                const newDocs = droppedDocs.length ? droppedDocs : de.complete.docDragData.droppedDocuments; // if nothing was added to the end of the list, then presumably the dropped documents were already in the list, but possibly got reordered so we use them.
 
-                //de.complete.docDragData.droppedDocuments;
                 const docs = this.childDocList;
                 DragManager.docsBeingDragged = [];
                 if (docs && newDocs.length) {
@@ -410,7 +410,7 @@ export class CollectionStackingView extends CollectionSubView<StackingDocument,
                     this.observer = new _global.ResizeObserver(action((entries: any) => {
                         if (this.layoutDoc._autoHeight && ref && this.refList.length && !SnappingManager.GetIsDragging()) {
                             const height = this.refList.reduce((p, r) => p + Number(getComputedStyle(r).height.replace("px", "")), 0);
-                            Doc.Layout(doc)._height = Math.max(height * NumCast(doc[this.props.fieldKey + "-height"]), NumCast(doc[this.props.fieldKey + "-height"]));
+                            Doc.Layout(doc)._height = Math.max(height, NumCast(doc[this.props.fieldKey + "-height"]));
                         }
                     }));
                     this.observer.observe(ref);
diff --git a/src/client/views/collections/TreeView.tsx b/src/client/views/collections/TreeView.tsx
index 4d4531ba8..ce13c1d38 100644
--- a/src/client/views/collections/TreeView.tsx
+++ b/src/client/views/collections/TreeView.tsx
@@ -552,7 +552,8 @@ export class TreeView extends React.Component<TreeViewProps> {
         </div>;
     }
 
-    @computed get renderTitleAsText() {
+    // renders the text version of a document as the header (e.g., useful for Slide views where the "")
+    @computed get renderTitleAsHeader() {
         return <>
             {this.renderBullet}
             {this.renderTitle}
@@ -596,7 +597,7 @@ export class TreeView extends React.Component<TreeViewProps> {
         />;
     }
 
-    @computed get renderDocumentInHeader() {
+    @computed get renderDocumentAsHeader() {
         return <>
             {this.renderBullet}
             {this.renderDocument(true)}
@@ -635,11 +636,11 @@ export class TreeView extends React.Component<TreeViewProps> {
                 onKeyDown={this.onKeyDown}>
                 {hideTitle ?
                     <li className="collection-child">
-                        {this.renderBulletHeader(this.renderDocumentInHeader)}
+                        {this.renderBulletHeader(this.renderDocumentAsHeader)}
                         {this.renderBorder}
                     </li> :
                     <li className="collection-child">
-                        {this.renderBulletHeader(this.renderTitleAsText)}
+                        {this.renderBulletHeader(this.renderTitleAsHeader)}
                         {this.renderBorder}
                     </li>
                 }