diff --git a/web/app/components/base/ui/dropdown-menu/index.tsx b/web/app/components/base/ui/dropdown-menu/index.tsx
index f3651bdded..e839fd24ef 100644
--- a/web/app/components/base/ui/dropdown-menu/index.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.tsx
@@ -13,7 +13,7 @@ export const DropdownMenuSub = Menu.SubmenuRoot
 export const DropdownMenuGroup = Menu.Group
 export const DropdownMenuRadioGroup = Menu.RadioGroup
 
-const menuRowBaseClassName = 'mx-1 flex h-8 cursor-pointer select-none items-center rounded-lg px-3 outline-none'
+const menuRowBaseClassName = 'mx-1 flex h-8 cursor-pointer select-none items-center rounded-lg px-2 outline-none'
 const menuRowStateClassName = 'data-[highlighted]:bg-state-base-hover data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50'
 
 export function DropdownMenuRadioItem({
diff --git a/web/app/components/header/account-dropdown/index.tsx b/web/app/components/header/account-dropdown/index.tsx
index 5af347bd8f..4cf1f4efda 100644
--- a/web/app/components/header/account-dropdown/index.tsx
+++ b/web/app/components/header/account-dropdown/index.tsx
@@ -27,8 +27,6 @@ import Compliance from './compliance'
 import { ExternalLinkIndicator, MenuItemContent } from './menu-item-content'
 import Support from './support'
 
-const menuStaticRowClassName = 'flex h-8 w-full items-center rounded-lg px-3 text-text-secondary system-md-regular'
-
 type AccountMenuRouteItemProps = {
   href: string
   iconClassName: string
@@ -229,13 +227,16 @@ export default function AppSelector() {
             </>
           )}
           <AccountMenuSection>
-            <div className={cn(menuStaticRowClassName, 'hover:bg-transparent')}>
+            <DropdownMenuItem
+              className="cursor-default data-[highlighted]:bg-transparent"
+              onSelect={e => e.preventDefault()}
+            >
               <MenuItemContent
                 iconClassName="i-ri-t-shirt-2-line"
                 label={t('theme.theme', { ns: 'common' })}
                 trailing={<ThemeSwitcher />}
               />
-            </div>
+            </DropdownMenuItem>
           </AccountMenuSection>
           <DropdownMenuSeparator className="!my-0 bg-divider-subtle" />
           <AccountMenuSection>