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
@@ -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;
 }