diff --git a/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl b/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl
index 43462ffb80e9eff7bb111379e9e9d52ebac56be3..90847f8e8f572691d2054f1ef387c8bcc8227e06 100644
--- a/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl
+++ b/layouts/v7/modules/Calendar/partials/SidebarEssentials.tpl
@@ -26,7 +26,7 @@
                     </div>
                     <hr style="margin: 5px 0;">
                     <div class="list-menu-content">
-                        <div id="{$SIDEBARWIDGET->get('linklabel')}" class="sidebar-widget-body activitytypes" style="max-height: 500px;">
+                        <div id="{$SIDEBARWIDGET->get('linklabel')}" class="sidebar-widget-body activitytypes">
                             <div style="text-align:center;"><img src="layouts/v7/skins/images/loading.gif"></div>
                         </div>
                     </div>
diff --git a/layouts/v7/modules/Calendar/resources/Calendar.js b/layouts/v7/modules/Calendar/resources/Calendar.js
index 0b938b775ac4a70758f3f6c50927d3d0f8d16aaf..e3926669f34b55c477b6773e68d6d8dad34ffa34 100644
--- a/layouts/v7/modules/Calendar/resources/Calendar.js
+++ b/layouts/v7/modules/Calendar/resources/Calendar.js
@@ -952,6 +952,8 @@ Vtiger.Class("Calendar_Calendar_Js", {
 			app.request.post({data: dataParams}).then(function (e, data) {
 				if (!e) {
 					widgetBody.html(data);
+                                        let fullCalendarViewHeight = $('.fc-view-container').height();
+                                        widgetBody.css('max-height', (fullCalendarViewHeight - 10) + 'px');
 					app.helper.showVerticalScroll(
 							widgetBody,
 							{