diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less
index 77262ce12..407ec8004 100644
--- a/www/calendar/app-calendar.less
+++ b/www/calendar/app-calendar.less
@@ -24,6 +24,23 @@
         .tui-full-calendar-layout {
             background-color: @cp_sidebar-right-bg !important;
             color: @cryptpad_text_col;
+            display: flex;
+            flex-flow: column;
+            .tui-full-calendar-week-container {
+                min-height: 0;
+                display: flex;
+                flex-flow: column;
+                .tui-full-calendar-vlayout-area {
+                    display: flex;
+                    flex-flow: column;
+                    flex: 1;
+                    min-height: 0;
+                    & > div:last-child {
+                        flex: 1;
+                        min-height: 0;
+                    }
+                }
+            }
             .tui-full-calendar-month {
                 .tui-full-calendar-weekday-schedule-time .tui-full-calendar-weekday-schedule-title {
                     color: @cryptpad_text_col !important; // XXX
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 1337041c7..90b2e0e45 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -757,6 +757,12 @@ Messages.calendar_noNotification = "None";
             });
         });
 
+        $('body').on('keydown', function (e) {
+            if (e.which === 27) {
+                $('.tui-full-calendar-floating-layer').hide();
+            }
+        });
+
         updateDateRange();
 
         renderCalendar();
@@ -971,6 +977,8 @@ Messages.calendar_noNotification = "None";
         var privateData = metadataMgr.getPrivateData();
         var user = metadataMgr.getUserData();
 
+        common.setTabTitle(Messages.calendar);
+
         // Fix flatpickr selection
         var MutationObserver = window.MutationObserver;
         var onFlatPickr = function (el) {