diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx
index f856edcb9..50e823c2a 100644
--- a/ts/components/conversation/header/ConversationHeaderTitle.tsx
+++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useConversationUsername } from '../../../hooks/useParamSelector';
 import { ConversationNotificationSettingType } from '../../../models/conversationAttributes';
 import { closeRightPanel, openRightPanel } from '../../../state/ducks/conversations';
-import { setRightOverlayMode } from '../../../state/ducks/section';
+import { resetRightOverlayMode, setRightOverlayMode } from '../../../state/ducks/section';
 import {
   getConversationHeaderTitleProps,
   getCurrentNotificationSettingText,
@@ -127,7 +127,7 @@ export const ConversationHeaderTitle = () => {
       if (visibleSubtitle === 'disappearingMessages') {
         dispatch(setRightOverlayMode('disappearing-messages'));
       } else {
-        dispatch(setRightOverlayMode('panel-settings'));
+        dispatch(resetRightOverlayMode());
       }
       dispatch(openRightPanel());
     }
diff --git a/ts/components/conversation/right-panel/RightPanel.tsx b/ts/components/conversation/right-panel/RightPanel.tsx
index b4eb18049..419f7f5d2 100644
--- a/ts/components/conversation/right-panel/RightPanel.tsx
+++ b/ts/components/conversation/right-panel/RightPanel.tsx
@@ -34,7 +34,6 @@ const ClosableOverlay = () => {
     case 'disappearing-messages':
       // TODO legacy messages support will be removed in a future release
       return <OverlayDisappearingMessages unlockNewModes={showNewDisppearingMessageModes} />;
-    case 'panel-settings':
     default:
       return <OverlayRightPanelSettings />;
   }
diff --git a/ts/state/ducks/section.tsx b/ts/state/ducks/section.tsx
index 09c4bfb97..89644ff30 100644
--- a/ts/state/ducks/section.tsx
+++ b/ts/state/ducks/section.tsx
@@ -87,7 +87,7 @@ export function resetOverlayMode(): ResetOverlayModeActionType {
 }
 
 // TODO possibly more overlays here
-export type RightOverlayMode = 'disappearing-messages' | 'panel-settings';
+export type RightOverlayMode = 'disappearing-messages';
 
 export function setRightOverlayMode(overlayMode: RightOverlayMode): RightOverlayModeActionType {
   return {