diff --git a/static/js/calendar.js b/static/js/calendar.js
index ab25c3a9b..95bdc36a2 100644
--- a/static/js/calendar.js
+++ b/static/js/calendar.js
@@ -771,7 +771,13 @@ function _getModal() {
       <button class="cal-side-nav cal-side-nav-next" id="cal-side-next" title="Next" aria-label="Next">&rsaquo;</button>
     </div>`;
   document.body.appendChild(_modal);
-  _modal.querySelector('#cal-close').addEventListener('click', closeCalendar);
+  _modal.querySelector('#cal-close').addEventListener('click', () => {
+    if (_modal.querySelector('.cal-form')) {
+      _render();
+      return;
+    }
+    closeCalendar();
+  });
   _modal.querySelector('#cal-side-prev')?.addEventListener('click', (e) => {
     e.preventDefault();
     e.stopPropagation();
diff --git a/static/js/emailLibrary/index.js b/static/js/emailLibrary/index.js
index ab2d690f5..4c472007b 100644
--- a/static/js/emailLibrary/index.js
+++ b/static/js/emailLibrary/index.js
@@ -2650,7 +2650,14 @@ export function openEmailLibrary(opts = {}) {
   }
 
   // Wire events
-  document.getElementById('email-lib-close').addEventListener('click', closeEmailLibrary);
+  document.getElementById('email-lib-close').addEventListener('click', () => {
+    const modal = document.getElementById('email-lib-modal');
+    if (modal?.classList.contains('email-reading') || modal?.querySelector('.doclib-card-expanded')) {
+      _exitEmailReaderModeForList();
+      return;
+    }
+    closeEmailLibrary();
+  });
   document.getElementById('email-settings-header-back')?.addEventListener('click', _hideEmailSettingsPage);
 
   // Clicking the modal header (anywhere except buttons/inputs) collapses