diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index d6ef0d6e..e7988b63 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -188,6 +188,11 @@ const MiddleHeader: FC<OwnProps & StateProps & DispatchProps> = ({
       }
     }
 
+    if (isSelectModeActive) {
+      exitMessageSelectMode();
+      return;
+    }
+
     if (threadId === MAIN_THREAD_ID && messageListType === 'thread' && currentTransitionKey === 0) {
       if (IS_SINGLE_COLUMN_LAYOUT || shouldShowCloseButton) {
         e.stopPropagation(); // Stop propagation to prevent chat re-opening on tablets
@@ -199,10 +204,6 @@ const MiddleHeader: FC<OwnProps & StateProps & DispatchProps> = ({
       return;
     }
 
-    if (messageListType === 'scheduled' && isSelectModeActive) {
-      exitMessageSelectMode();
-    }
-
     openPreviousChat();
   }, [
     threadId, messageListType, currentTransitionKey, isSelectModeActive, openPreviousChat, shouldShowCloseButton,