diff --git a/NEWS b/NEWS
index 2dc79d15a..7ab703be7 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Enhancements
  - [web] show source addressbook of matching contacts in appointment editor (#4579)
  - [web] improve display of keyboard shortcuts
  - [web] show time for messages of yesterday (#4599)
+ - [web] fit month view to window size (#4554)
 
 Bug fixes
  - [sogo-tool] fixed "manage-acl unsubscribe" command (#4591)
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index 59c30ca69..5d012d396 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -71,7 +71,7 @@
       <div class="calendarView monthView">
         <md-grid-list
             var:md-cols="headerDaysToDisplay.count"
-            md-row-height="1:1"
+            md-row-height="fit"
             md-gutter="0">
           <var:foreach list="weeksToDisplay" item="currentWeek">
             <var:foreach list="currentWeek" item="currentTableDay">
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index f51500216..a78cd1cf7 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -555,6 +555,9 @@ $quarter_height: 10px;
       flex: 1 1 0;
       text-align: center;
     }
+    md-grid-list {
+      height: 100%;
+    }
     md-grid-tile {
       // Border of month day cell
       border-right: 1px solid $colorGrey100;