diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx
index c25a9d9c2..5581e234c 100644
--- a/ts/components/conversation/header/ConversationHeaderTitle.tsx
+++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx
@@ -108,14 +108,15 @@ export const ConversationHeaderTitle = () => {
   const handleRightPanelToggle = () => {
     if (isRightPanelOn) {
       dispatch(closeRightPanel());
+      return;
+    }
+
+    if (visibleSubtitle === 'disappearingMessages') {
+      dispatch(setRightOverlayMode('disappearing-messages'));
     } else {
-      if (visibleSubtitle === 'disappearingMessages') {
-        dispatch(setRightOverlayMode('disappearing-messages'));
-      } else {
-        dispatch(resetRightOverlayMode());
-      }
-      dispatch(openRightPanel());
+      dispatch(resetRightOverlayMode());
     }
+    dispatch(openRightPanel());
   };
 
   useEffect(() => {