diff --git a/apps/src/aiTeacherDrawer/AiDiffDrawer.tsx b/apps/src/aiTeacherDrawer/AiDiffDrawer.tsx
index 662d2825de685..9d1820e77cc0c 100644
--- a/apps/src/aiTeacherDrawer/AiDiffDrawer.tsx
+++ b/apps/src/aiTeacherDrawer/AiDiffDrawer.tsx
@@ -36,7 +36,7 @@ const AiDiffContainer: React.FC<AiDiffContainerProps> = ({
 }) => {
   // Welcome experience shut off in preparation for spring 2026 redesign.
   const [showWelcomeExperience, setShowWelcomeExperience] = useState(false);
-  const [activeNav, setActiveNav] = useState('Home');
+  const [activeNav, setActiveNav] = useState('Chats');
   const [showChatList, setShowChatList] = useState(false);
   const {personalizationData} = useTeachingProfileData();
 
diff --git a/apps/src/aiTeacherDrawer/BottomNav.tsx b/apps/src/aiTeacherDrawer/BottomNav.tsx
index d16e94ecd357c..fa6aae373345e 100644
--- a/apps/src/aiTeacherDrawer/BottomNav.tsx
+++ b/apps/src/aiTeacherDrawer/BottomNav.tsx
@@ -10,9 +10,9 @@ interface NavItem {
 }
 
 const NAV_ITEMS: NavItem[] = [
-  {label: 'Home', iconName: 'house'},
+  // {label: 'Home', iconName: 'house'},
   {label: 'Chats', iconName: 'comment'},
-  {label: 'Learn', iconName: 'file-lines'},
+  // {label: 'Learn', iconName: 'file-lines'},
   {label: 'Alerts', iconName: 'bell'},
 ];
 
diff --git a/apps/src/aiTeacherDrawer/ChatList.tsx b/apps/src/aiTeacherDrawer/ChatList.tsx
index 2a36e2a198c06..9b2a863a07748 100644
--- a/apps/src/aiTeacherDrawer/ChatList.tsx
+++ b/apps/src/aiTeacherDrawer/ChatList.tsx
@@ -133,7 +133,8 @@ const ChatList: React.FC<ChatListProps> = ({
         curriculumCourses: curriculumCourses,
       })
     );
-  }, [curriculumCourses, context, dispatch]);
+    onChatSelect?.();
+  }, [curriculumCourses, context, dispatch, onChatSelect]);
 
   return (
     <aside