diff --git a/ui/src/components/KeyboardShortcutsCheatsheet.tsx b/ui/src/components/KeyboardShortcutsCheatsheet.tsx
index 3300852422f..c6847e0e6ab 100644
--- a/ui/src/components/KeyboardShortcutsCheatsheet.tsx
+++ b/ui/src/components/KeyboardShortcutsCheatsheet.tsx
@@ -11,11 +11,13 @@ interface ShortcutEntry {
// Platform-appropriate label for the Cmd/Ctrl modifier so the cheatsheet shows
// the same key the user actually presses (re-pointed in the collapsible sidebar
// work — Cmd/Ctrl+B toggles the rail).
-const META_KEY =
- typeof navigator !== "undefined" &&
- /Mac|iPhone|iPad|iPod/.test(navigator.platform || navigator.userAgent || "")
- ? "⌘"
- : "Ctrl";
+function getPlatformLabel() {
+ if (typeof navigator === "undefined") return "";
+ const nav = navigator as Navigator & { userAgentData?: { platform?: string } };
+ return nav.userAgentData?.platform || navigator.userAgent || "";
+}
+
+const META_KEY = /Mac|iPhone|iPad|iPod/.test(getPlatformLabel()) ? "⌘" : "Ctrl";
interface ShortcutSection {
title: string;
diff --git a/ui/src/components/SidebarAccountMenu.tsx b/ui/src/components/SidebarAccountMenu.tsx
index 1f3325c37fe..b127b3730d5 100644
--- a/ui/src/components/SidebarAccountMenu.tsx
+++ b/ui/src/components/SidebarAccountMenu.tsx
@@ -17,7 +17,7 @@ import { useSidebar } from "../context/SidebarContext";
import { useTheme } from "../context/ThemeContext";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import { cn } from "../lib/utils";
+import { cn, SIDEBAR_RAIL_HIDDEN_LABEL } from "../lib/utils";
const PROFILE_SETTINGS_PATH = "/company/settings/instance/profile";
const DOCS_URL = "https://docs.paperclip.ing/";
@@ -151,7 +151,7 @@ export function SidebarAccountMenu({
{session?.user.image ? : null}
{initials}
- {displayName}
+ {displayName}
{selectedCompany ? : null}
-
+
{selectedCompany?.name ?? "Select workspace"}