diff --git a/web/selectors/nav-selectors.js b/web/selectors/nav-selectors.js
--- a/web/selectors/nav-selectors.js
+++ b/web/selectors/nav-selectors.js
@@ -14,7 +14,7 @@
   ComposableMessageInfo,
   RobotextMessageInfo,
 } from 'lib/types/message-types';
-import type { ThreadInfo } from 'lib/types/thread-types';
+import { type ThreadInfo } from 'lib/types/thread-types';
 
 import { getDefaultTextMessageRules } from '../markdown/rules.react';
 import type { AppState } from '../redux/redux-setup';
@@ -215,6 +215,10 @@
 }
 
 function navTabSelector(state: AppState): NavigationTab {
+  if (state.navInfo.tab === 'chat-creation' || state.navInfo.tab === 'chat') {
+    return 'chat';
+  }
+
   return state.navInfo.tab;
 }