diff --git a/src/Menu.module.css b/src/Menu.module.css
index 294bccda..bb75cecb 100644
--- a/src/Menu.module.css
+++ b/src/Menu.module.css
@@ -30,10 +30,12 @@
 
 .menuItem.focused:first-child,
 .menuItem:hover:first-child {
-  border-radius: 8px 8px 0 0;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
 }
 
 .menuItem.focused:last-child,
 .menuItem:hover:last-child {
-  border-radius: 0 0 8px 8px;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
diff --git a/src/Room.jsx b/src/Room.jsx
index b1ed3e00..241b834b 100644
--- a/src/Room.jsx
+++ b/src/Room.jsx
@@ -438,7 +438,7 @@ function InRoomView({
         </LeftNav>
         <RightNav>
           <GridLayoutMenu layout={layout} setLayout={setLayout} />
-          <UserMenu />
+          <UserMenu disableLogout />
         </RightNav>
       </Header>
       {items.length === 0 ? (
diff --git a/src/UserMenu.jsx b/src/UserMenu.jsx
index 65d0b9e8..cb9b1598 100644
--- a/src/UserMenu.jsx
+++ b/src/UserMenu.jsx
@@ -13,7 +13,7 @@ import { useModalTriggerState } from "./Modal";
 import { ProfileModal } from "./ProfileModal";
 import { Tooltip, TooltipTrigger } from "./Tooltip";
 
-export function UserMenu() {
+export function UserMenu({ disableLogout }) {
   const location = useLocation();
   const history = useHistory();
   const { isAuthenticated, isGuest, logout, userName, client } = useClient();
@@ -64,7 +64,7 @@ export function UserMenu() {
           icon: LoginIcon,
         }
       );
-    } else {
+    } else if (!disableLogout) {
       arr.push({
         key: "logout",
         label: "Sign Out",