Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web

1 files changed, 1 insertions, 1 deletions

diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 9e8600193..171aecc70 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -378,7 +378,7 @@ export class CollectionStackingView extends CollectionSubView(doc => doc) {
     }
     @computed get contentScale() {
         const heightExtra = this.heightPercent > 1 ? this.heightPercent : 1;
-        return Math.max(this.props.Document[WidthSym]() / this.props.PanelWidth(), heightExtra * this.props.Document[HeightSym]() / this.props.PanelHeight());
+        return Math.min(this.props.Document[WidthSym]() / this.props.PanelWidth(), heightExtra * this.props.Document[HeightSym]() / this.props.PanelHeight());
     }
     @computed get widthScale() {
         return this.heightPercent < 1 ? Math.max(1, this.contentScale) : 1;