diff --git a/src/sao.less b/src/sao.less
index 82a99e44e9..05fdd148cf 100644
--- a/src/sao.less
+++ b/src/sao.less
@@ -211,6 +211,10 @@ img.icon {
     }
 }
 
+.content-box {
+    overflow-y: auto;
+}
+
 .list-form {
     overflow-y: auto;
     -moz-user-select: none;
diff --git a/src/view/calendar.js b/src/view/calendar.js
index 22088dc76f..4e9cd764b1 100644
--- a/src/view/calendar.js
+++ b/src/view/calendar.js
@@ -66,6 +66,13 @@
                 eventClick: this.view.event_click.bind(this.view),
                 dayClick: this.view.day_click.bind(this.view),
             });
+
+            if (attributes.height !== undefined) {
+                this.view.el.css('min-height', attributes.height + 'px');
+            }
+            if (attributes.width !== undefined) {
+                this.view.el.css('min-width', attributes.width + 'px');
+            }
         },
         _parse_field: function(node, attributes) {
             this.view.fields.push(attributes.name);