Merge branch 'master' into aarav_edit

2 files changed, 3 insertions, 3 deletions

diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 72e6bb8f2..6bbd43b1b 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -239,9 +239,9 @@ export class CollectionStackingView extends CollectionSubView<Partial<collection
         );
         // reset section headers when a new filter is inputted
         this._disposers.width = reaction(
-            () => [this._props.PanelWidth() - 2 * this.xMargin, NumCast(this.Document._layout_columnWidth, 250)],
+            () => [this._props.PanelWidth() - 2 * this.xMargin, NumCast(this.Document._layout_columnWidth)],
             ([pw, cw]) => {
-                if (!this.isStackingView && Math.round(pw / cw)) {
+                if (cw && !this.isStackingView && Math.round(pw / cw)) {
                     this.layoutDoc._layout_columnCount = Math.round(pw / cw);
                 }
             }
diff --git a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
index cd46ae824..c847bc546 100644
--- a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
@@ -402,7 +402,7 @@ export class SchemaDateCell extends ObservableReactComponent<SchemaTableCellProp
                 </div>
                 {pointerEvents === 'none' ? null : (
                     <Popup
-                        icon={<FontAwesomeIcon size="sm" icon="caret-down" />}
+                        icon={<FontAwesomeIcon size="xs" icon="caret-down" />}
                         size={Size.XSMALL}
                         type={Type.TERT}
                         color={SnappingManager.userColor}