diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js
index fc163f79..d16d807b 100644
--- a/source/Ox.UI/js/Calendar/Ox.Calendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js
@@ -878,7 +878,8 @@ Ox.Calendar = function(options, self) {
             self.lineEvents[line].push(event);            
         });
         self.contentHeight = Math.max(
-            self.lineEvents.length * 16, self.$container.height()
+            self.lineEvents.length * 16,
+            self.options.height - 72 // 24 + 16 + 16 + 16
         );
         self.$content.css({height: self.contentHeight + 'px'});
     }
@@ -1049,6 +1050,7 @@ Ox.Calendar = function(options, self) {
 
     that.resizeCalendar = function() {
         self.options.width = that.width();
+        self.options.height = that.height();
         self.$zoomInput.options({size: self.options.width});
         getLines();
         renderCalendar();