diff --git a/src/components/command-palette/useCommandPaletteActions.tsx b/src/components/command-palette/useCommandPaletteActions.tsx
index 998fb97b8..4b288c3bc 100644
--- a/src/components/command-palette/useCommandPaletteActions.tsx
+++ b/src/components/command-palette/useCommandPaletteActions.tsx
@@ -86,6 +86,12 @@ export function useCommandPaletteActions(
                 icon: <Globe className="size-4" />,
                 href: `/${orgId}/settings/resources/proxy/create`
             });
+            actions.push({
+                id: "create-machine-client",
+                label: t("commandPaletteCreateMachineClient"),
+                icon: <MonitorUp className="size-4" />,
+                href: `/${orgId}/settings/clients/machine/create`
+            });
             actions.push({
                 id: "create-user",
                 label: t("commandPaletteCreateUser"),
@@ -98,12 +104,6 @@ export function useCommandPaletteActions(
                 icon: <KeyRound className="size-4" />,
                 href: `/${orgId}/settings/api-keys/create`
             });
-            actions.push({
-                id: "create-machine-client",
-                label: t("commandPaletteCreateMachineClient"),
-                icon: <MonitorUp className="size-4" />,
-                href: `/${orgId}/settings/clients/machine/create`
-            });
 
             if (!env?.flags.disableEnterpriseFeatures) {
                 actions.push({
@@ -129,17 +129,6 @@ export function useCommandPaletteActions(
             }
         }
 
-        const canChooseOrganization = !isAdminPage && (orgs?.length ?? 0) > 1;
-
-        if (canChooseOrganization) {
-            actions.push({
-                id: "choose-org",
-                label: t("commandPaletteChooseOrganization"),
-                icon: <Building2 className="size-4" />,
-                href: "/?orgs=1"
-            });
-        }
-
         actions.push({
             id: "toggle-theme",
             label: t("commandPaletteToggleTheme"),
@@ -158,4 +147,4 @@ export function useCommandPaletteActions(
 
         return actions;
     }, [isAdminPage, orgId, orgs, env, user.serverAdmin, theme, setTheme, t]);
-}
\ No newline at end of file
+}
diff --git a/src/components/ui/command.tsx b/src/components/ui/command.tsx
index efd1c35f5..3d577c275 100644
--- a/src/components/ui/command.tsx
+++ b/src/components/ui/command.tsx
@@ -174,10 +174,11 @@ function CommandShortcut({
     ...props
 }: React.ComponentProps<"span">) {
     return (
-        <span
+        <kbd
             data-slot="command-shortcut"
             className={cn(
                 "text-muted-foreground ml-auto text-xs tracking-widest",
+                "px-1 py-0.5 rounded-sm border-border bg-muted border",
                 className
             )}
             {...props}