diff --git a/src/app/pages/auth/ServerPicker.tsx b/src/app/pages/auth/ServerPicker.tsx
index b295e7b50..761f685e6 100644
--- a/src/app/pages/auth/ServerPicker.tsx
+++ b/src/app/pages/auth/ServerPicker.tsx
@@ -134,7 +134,8 @@ export function ServerPicker({
               aria-label="Change server"
               variant={allowCustomServer ? 'Background' : 'Surface'}
               size="300"
-              aria-pressed={!!serverMenuAnchor}
+              aria-expanded={!!serverMenuAnchor}
+              aria-haspopup="menu"
               radii="300"
             >
               <Icon src={Icons.ChevronBottom} />
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx
index 3fa3e81d8..89da68d18 100644
--- a/src/app/pages/auth/login/PasswordLoginForm.tsx
+++ b/src/app/pages/auth/login/PasswordLoginForm.tsx
@@ -98,7 +98,8 @@ function UsernameHint({ server }: { server: string }) {
         size="300"
         radii="300"
         aria-label="Username format hint"
-        aria-pressed={!!anchor}
+        aria-expanded={!!anchor}
+        aria-haspopup="dialog"
       >
         <Icon style={{ opacity: config.opacity.P300 }} size="100" src={Icons.Info} />
       </IconButton>
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index 1279bfb67..eea6f3e1e 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -233,7 +233,8 @@ function ThirdPartyProtocolsSelector({
     >
       <Chip
         onClick={handleOpenMenu}
-        aria-pressed={!!menuAnchor}
+        aria-expanded={!!menuAnchor}
+        aria-haspopup="menu"
         radii="Pill"
         size="400"
         variant={instanceId ? 'Success' : 'SurfaceVariant'}
@@ -328,7 +329,8 @@ function LimitButton({ limit, onLimitChange }: LimitButtonProps) {
     >
       <Chip
         onClick={handleOpenMenu}
-        aria-pressed={!!menuAnchor}
+        aria-expanded={!!menuAnchor}
+        aria-haspopup="menu"
         radii="Pill"
         size="400"
         variant="SurfaceVariant"