diff --git a/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx b/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx
index cb872ad540ac0..0f636fbb9c1cb 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx
+++ b/web/packages/teleport/src/Console/DocumentNodes/DocumentNodes.tsx
@@ -128,6 +128,7 @@ const Container = styled(Box)`
   display: flex;
   flex: 1;
   max-width: 1024px;
+  height: fit-content;
   ::after {
     content: ' ';
     padding-bottom: 24px;
diff --git a/web/packages/teleport/src/Console/DocumentNodes/__snapshots__/DocumentNodes.story.test.tsx.snap b/web/packages/teleport/src/Console/DocumentNodes/__snapshots__/DocumentNodes.story.test.tsx.snap
index 42c219e916227..6659e5c9d2c9f 100644
--- a/web/packages/teleport/src/Console/DocumentNodes/__snapshots__/DocumentNodes.story.test.tsx.snap
+++ b/web/packages/teleport/src/Console/DocumentNodes/__snapshots__/DocumentNodes.story.test.tsx.snap
@@ -739,6 +739,7 @@ exports[`render DocumentNodes 1`] = `
   display: flex;
   flex: 1;
   max-width: 1024px;
+  height: fit-content;
 }
 
 .c2::after {
diff --git a/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx b/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx
index 1094879d2e8dd..642f59a7e84a3 100644
--- a/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx
+++ b/web/packages/teleport/src/Sessions/SessionList/SessionJoinBtn.tsx
@@ -35,8 +35,14 @@ export const SessionJoinBtn = ({
   participantModes: ParticipantMode[];
   showCTA: boolean;
 }) => {
+  const [anchorEl, setAnchorEl] = useState<HTMLElement>(null);
+
+  function closeMenu() {
+    setAnchorEl(null);
+  }
+
   return (
-    <JoinMenu>
+    <JoinMenu anchorEl={anchorEl} setAnchorEl={setAnchorEl}>
       {showCTA && (
         <Box mx="12px" my="3">
           <ButtonLockedFeature
@@ -56,6 +62,7 @@ export const SessionJoinBtn = ({
         participantMode="observer"
         key="observer"
         showCTA={showCTA}
+        closeMenu={closeMenu}
       />
       <JoinMenuItem
         title="As a Moderator"
@@ -65,6 +72,7 @@ export const SessionJoinBtn = ({
         participantMode="moderator"
         key="moderator"
         showCTA={showCTA}
+        closeMenu={closeMenu}
       />
       <JoinMenuItem
         title="As a Peer"
@@ -74,14 +82,21 @@ export const SessionJoinBtn = ({
         participantMode="peer"
         key="peer"
         showCTA={showCTA}
+        closeMenu={closeMenu}
       />
     </JoinMenu>
   );
 };
 
-function JoinMenu({ children }: { children: React.ReactNode }) {
-  const [anchorEl, setAnchorEl] = useState<HTMLElement>(null);
-
+function JoinMenu({
+  children,
+  anchorEl,
+  setAnchorEl,
+}: {
+  children: React.ReactNode;
+  anchorEl: HTMLElement;
+  setAnchorEl: React.Dispatch<React.SetStateAction<HTMLElement>>;
+}) {
   const handleClickListItem = (event: React.MouseEvent<HTMLElement>) => {
     setAnchorEl(event.currentTarget);
   };
@@ -122,6 +137,7 @@ function JoinMenuItem({
   participantMode,
   url,
   showCTA,
+  closeMenu,
 }: {
   title: string;
   description: string;
@@ -129,6 +145,7 @@ function JoinMenuItem({
   participantMode: ParticipantMode;
   url: string;
   showCTA: boolean;
+  closeMenu: () => void;
 }) {
   if (hasAccess && !showCTA) {
     return (
@@ -136,6 +153,7 @@ function JoinMenuItem({
         as="a"
         href={url}
         target="_blank"
+        onClick={closeMenu}
         css={`
           text-decoration: none;
           padding: 8px 12px;
diff --git a/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx b/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx
index bebef8ab9ce9c..a748bff5ef1a5 100644
--- a/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx
+++ b/web/packages/teleport/src/Sessions/SessionList/SessionList.tsx
@@ -112,7 +112,7 @@ const renderJoinCell = ({
   showActiveSessionsCTA,
 }: renderJoinCellProps) => {
   const { joinable } = kinds[kind];
-  if (!joinable || participantModes.length === 0) {
+  if (!joinable) {
     return <Cell align="right" height="26px" />;
   }