diff --git a/web/src/hotkey.js b/web/src/hotkey.js
index dca042d359..9126a495f1 100644
--- a/web/src/hotkey.js
+++ b/web/src/hotkey.js
@@ -272,13 +272,12 @@ export function process_escape_key(e) {
         return true;
     }
 
-    if (popovers.any_active() || sidebar_ui.any_sidebar_expanded_as_overlay()) {
+    if (popovers.any_active()) {
         if (user_card_popover.manage_menu.is_open()) {
             user_card_popover.manage_menu.hide();
             $("#user_card_popover .user-card-popover-manage-menu-btn").trigger("focus");
             return true;
         }
-        sidebar_ui.hide_all();
         popovers.hide_all();
         return true;
     }
@@ -350,6 +349,11 @@ export function process_escape_key(e) {
         return true;
     }
 
+    if (sidebar_ui.any_sidebar_expanded_as_overlay()) {
+        sidebar_ui.hide_all();
+        return true;
+    }
+
     if (compose_state.composing()) {
         compose_actions.cancel();
         return true;