diff --git a/next-frontend/src/components/competitions/LiveMenu.tsx b/next-frontend/src/components/competitions/LiveMenu.tsx
index 12f1474582..52b933afc9 100644
--- a/next-frontend/src/components/competitions/LiveMenu.tsx
+++ b/next-frontend/src/components/competitions/LiveMenu.tsx
@@ -23,7 +23,7 @@ export default async function LiveMenu({
   const tabs = duringCompetitionTabs(competitionInfo, data.rounds);
 
   return (
-    <TabMenu tabs={tabs} competitionInfo={competitionInfo}>
+    <TabMenu tabs={tabs} competitionInfo={competitionInfo} isLiveMenu>
       {children}
     </TabMenu>
   );
diff --git a/next-frontend/src/components/competitions/TabMenu.tsx b/next-frontend/src/components/competitions/TabMenu.tsx
index 1ec0b414f6..006cd97f3d 100644
--- a/next-frontend/src/components/competitions/TabMenu.tsx
+++ b/next-frontend/src/components/competitions/TabMenu.tsx
@@ -8,6 +8,7 @@ import {
   Collapsible,
   Drawer,
   IconButton,
+  Separator,
   Spacer,
   Tabs,
   Text,
@@ -24,25 +25,40 @@ import { useState } from "react";
 import { TFunction } from "i18next";
 import { LuAlignJustify } from "react-icons/lu";
 import { iconMap } from "@/components/icons/iconMap";
+import { route } from "nextjs-routes";
+import { parseActivityCode } from "@/lib/wca/wcif/rounds";
+
+function parseActivityCodeOrNull(path: string) {
+  try {
+    const { eventId } = parseActivityCode(path);
+    return eventId;
+  } catch {
+    return null;
+  }
+}
 
 export default function TabMenu({
   competitionInfo,
   children,
   tabs,
+  isLiveMenu = false,
 }: {
   children: React.ReactNode;
   competitionInfo: components["schemas"]["CompetitionInfo"];
   tabs: CompetitionNavTab[];
+  isLiveMenu?: boolean;
 }) {
-  const [openGroup, setOpenGroup] = useState<string | null>(null);
-  const [drawerOpen, setDrawerOpen] = useState(false);
-
   const pathName = usePathname();
   const { t } = useT();
 
   const path = _.last(pathName.split("/"));
   const currentPath = path === competitionInfo.id ? "general" : path;
 
+  const eventId = parseActivityCodeOrNull(currentPath!);
+
+  const [openGroup, setOpenGroup] = useState<string | null>(eventId);
+  const [drawerOpen, setDrawerOpen] = useState(false);
+
   return (
     <Tabs.Root
       variant="enclosed"
@@ -56,7 +72,7 @@ export default function TabMenu({
       <Tabs.List
         height="fit-content"
         position="sticky"
-        minWidth="fit-content"
+        width="3xs"
         textAlign="center"
         hideBelow="md"
         gap="3"
@@ -68,6 +84,8 @@ export default function TabMenu({
           onToggle={(tab: CompetitionNavTab) =>
             setOpenGroup((prev) => (prev === tab.menuKey ? null : tab.menuKey))
           }
+          isLiveMenu={isLiveMenu}
+          competitionInfo={competitionInfo}
         />
       </Tabs.List>
       <Box hideFrom="md" mb="4">
@@ -117,6 +135,7 @@ export default function TabMenu({
                         prev === tab.menuKey ? null : tab.menuKey,
                       )
                     }
+                    competitionInfo={competitionInfo}
                   />
                 </Tabs.List>
               </Drawer.Body>
@@ -136,28 +155,68 @@ function TabList({
   t,
   onToggle,
   openGroup,
+  isLiveMenu,
+  competitionInfo,
 }: {
   tabs: CompetitionNavTab[];
   t: TFunction;
   openGroup: string | null;
   onToggle: (tab: CompetitionNavTab) => void;
+  isLiveMenu?: boolean;
+  competitionInfo: components["schemas"]["CompetitionInfo"];
 }) {
-  return tabs.map((tab) =>
-    "href" in tab ? (
-      <Tabs.Trigger value={tab.menuKey} asChild key={tab.menuKey}>
-        <Text asChild textStyle="bodyEmphasis" justifyContent="left">
-          <Link href={tab.href}>{t(tab.i18nKey)}</Link>
-        </Text>
-      </Tabs.Trigger>
-    ) : (
-      <CollapsibleTabGroup
-        key={tab.menuKey}
-        tab={tab}
-        t={t}
-        isOpen={openGroup === tab.menuKey}
-        onToggle={() => onToggle(tab)}
-      />
-    ),
+  return (
+    <>
+      {tabs.map((tab) =>
+        "href" in tab ? (
+          <Tabs.Trigger value={tab.menuKey} asChild key={tab.menuKey}>
+            <Text asChild textStyle="bodyEmphasis" justifyContent="left">
+              <Link href={tab.href}>{t(tab.i18nKey)}</Link>
+            </Text>
+          </Tabs.Trigger>
+        ) : (
+          <CollapsibleTabGroup
+            key={tab.menuKey}
+            tab={tab}
+            t={t}
+            isOpen={openGroup === tab.menuKey}
+            onToggle={() => onToggle(tab)}
+          />
+        ),
+      )}
+      {!isLiveMenu && (
+        <>
+          <Separator />
+          {competitionInfo.tab_names.map((tabName) => (
+            <Tabs.Trigger
+              key={tabName}
+              value={tabName}
+              minHeight="fit-content"
+              asChild
+            >
+              <Text
+                textStyle="bodyEmphasis"
+                asChild
+                maxW="44"
+                justifyContent="left"
+              >
+                <Link
+                  href={route({
+                    pathname: "/competitions/[competitionId]/tabs/[tabName]",
+                    query: {
+                      competitionId: competitionInfo.id,
+                      tabName: encodeURIComponent(tabName),
+                    },
+                  })}
+                >
+                  {tabName}
+                </Link>
+              </Text>
+            </Tabs.Trigger>
+          ))}
+        </>
+      )}
+    </>
   );
 }
 
@@ -185,6 +244,7 @@ function CollapsibleTabGroup({
         py="2"
         borderRadius="md"
         _hover={{ bg: "bg.subtle" }}
+        cursor="pointer"
       >
         <Text textStyle="bodyEmphasis">
           <IconComponent /> {t(i18nKey)}
diff --git a/next-frontend/src/lib/wca/competitions/tabs.ts b/next-frontend/src/lib/wca/competitions/tabs.ts
index e1532b9898..3fe771a2ae 100644
--- a/next-frontend/src/lib/wca/competitions/tabs.ts
+++ b/next-frontend/src/lib/wca/competitions/tabs.ts
@@ -127,10 +127,15 @@ export const duringCompetitionTabs = (
           rounds.length,
           Boolean(round.cutoff),
         );
+
+        const roundDone =
+          round.state === "locked" ||
+          (round.state === "open" &&
+            round.competitors_live_results_entered === round.total_competitors);
         return {
           i18nKey: `rounds.${roundTypeId}.name`,
           menuKey: round.id,
-          badge: round.state === "locked" ? "Done" : "live",
+          badge: roundDone ? "Done" : "live",
           disabled: round.state === "pending" || round.state === "ready",
           href: route({
             pathname: "/competitions/[competitionId]/live/rounds/[roundId]",