diff --git a/frontend/src/Navigation.tsx b/frontend/src/Navigation.tsx
index 58187151..a31f7090 100644
--- a/frontend/src/Navigation.tsx
+++ b/frontend/src/Navigation.tsx
@@ -4,7 +4,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import { NavLink, useNavigate } from 'react-router-dom';
 import {
   LayoutGrid,
-  LogOut,
   Menu,
   PanelLeftClose,
   PanelLeftOpen,
@@ -79,15 +78,7 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
   const selectedAgent = useSelector(selectSelectedAgent);
 
   const { isMobile, isTablet } = useMediaQuery();
-  const {
-    showTokenModal,
-    handleTokenSubmit,
-    authType,
-    logout,
-    userEmail,
-    userName,
-    userPicture,
-  } = useTokenAuth();
+  const { showTokenModal, handleTokenSubmit } = useTokenAuth();
 
   const [isDeletingConversation, setIsDeletingConversation] = useState(false);
   const [uploadModalState, setUploadModalState] =
@@ -656,48 +647,6 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
                 {t('settings.label')}
               </p>
             </NavLink>
-            {authType === 'oidc' && (
-              <div className="mx-4 my-auto flex items-center gap-2.5 py-0.5 pr-1 pl-3">
-                {userPicture ? (
-                  <Avatar
-                    src={userPicture}
-                    alt={userName || userEmail || 'User avatar'}
-                    className="size-6"
-                    imgClassName="size-6 rounded-full object-cover"
-                  />
-                ) : (
-                  <Avatar className="size-6">
-                    <span className="bg-sidebar-accent text-foreground flex size-6 items-center justify-center rounded-full text-xs font-medium dark:text-white">
-                      {(userName || userEmail || '?').charAt(0).toUpperCase()}
-                    </span>
-                  </Avatar>
-                )}
-                <span className="flex min-w-0 flex-1 flex-col items-start">
-                  {userName && (
-                    <p className="text-foreground max-w-[160px] truncate text-sm dark:text-white">
-                      {userName}
-                    </p>
-                  )}
-                  {userEmail && (
-                    <p className="text-muted-foreground max-w-[160px] truncate text-xs">
-                      {userEmail}
-                    </p>
-                  )}
-                </span>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  onClick={logout}
-                  data-testid="oidc-signout"
-                  aria-label={t('auth.signOut')}
-                  title={t('auth.signOut')}
-                  className="text-muted-foreground hover:text-foreground shrink-0 rounded-full"
-                >
-                  <LogOut className="size-5" strokeWidth={1.75} />
-                </Button>
-              </div>
-            )}
           </div>
           <div className="text-foreground flex flex-col justify-end dark:text-white">
             <div className="flex items-center justify-between py-1">
diff --git a/frontend/src/components/ActionButtons.tsx b/frontend/src/components/ActionButtons.tsx
index 4a1e609d..8520315f 100644
--- a/frontend/src/components/ActionButtons.tsx
+++ b/frontend/src/components/ActionButtons.tsx
@@ -11,6 +11,7 @@ import {
   updateConversationId,
 } from '../conversation/conversationSlice';
 import { Button } from './ui/button';
+import ProfileButton from './ProfileButton';
 
 interface ActionButtonsProps {
   className?: string;
@@ -86,7 +87,7 @@ export default function ActionButtons({
             )}
           </>
         )}
-        <div>{/* <UserButton  /> */}</div>
+        <ProfileButton />
       </div>
     </div>
   );
diff --git a/frontend/src/components/ProfileButton.tsx b/frontend/src/components/ProfileButton.tsx
new file mode 100644
index 00000000..790d9a07
--- /dev/null
+++ b/frontend/src/components/ProfileButton.tsx
@@ -0,0 +1,83 @@
+import { LogOut } from 'lucide-react';
+import { useTranslation } from 'react-i18next';
+
+import useTokenAuth from '../hooks/useTokenAuth';
+import { Avatar } from './ui/avatar';
+import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
+
+/**
+ * Top-right account menu for OIDC sessions: an avatar that opens a popover
+ * showing the signed-in name/email and a sign-out action. Renders nothing for
+ * other auth modes, which carry no user identity.
+ */
+export default function ProfileButton() {
+  const { t } = useTranslation();
+  const { authType, userName, userEmail, userPicture, logout } = useTokenAuth();
+
+  if (authType !== 'oidc' || (!userName && !userEmail)) return null;
+
+  const initial = (userName || userEmail || '?').charAt(0).toUpperCase();
+  const renderAvatar = (size: string, text: string) =>
+    userPicture ? (
+      <Avatar
+        src={userPicture}
+        alt={userName || userEmail || 'User avatar'}
+        className={size}
+        imgClassName={`${size} rounded-full object-cover`}
+      />
+    ) : (
+      <Avatar className={size}>
+        <span
+          className={`bg-primary text-primary-foreground flex ${size} items-center justify-center rounded-full ${text} font-medium`}
+        >
+          {initial}
+        </span>
+      </Avatar>
+    );
+
+  return (
+    <Popover>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          aria-label={t('auth.account')}
+          className="ring-offset-background focus-visible:ring-ring hover:ring-primary/40 rounded-full transition outline-none hover:ring-2 hover:ring-offset-2 focus-visible:ring-2 focus-visible:ring-offset-2"
+        >
+          {renderAvatar('size-8', 'text-sm')}
+        </button>
+      </PopoverTrigger>
+      <PopoverContent align="end" sideOffset={8} className="w-64 p-0">
+        <div className="flex items-center gap-3 p-4">
+          {renderAvatar('size-10', 'text-base')}
+          <span className="flex min-w-0 flex-col">
+            {userName && (
+              <p className="text-foreground truncate text-sm font-medium dark:text-white">
+                {userName}
+              </p>
+            )}
+            {userEmail && (
+              <p className="text-muted-foreground truncate text-xs">
+                {userEmail}
+              </p>
+            )}
+          </span>
+        </div>
+        <div className="dark:border-sidebar-border border-t" />
+        <div className="p-1">
+          <button
+            type="button"
+            onClick={logout}
+            data-testid="oidc-signout"
+            className="text-foreground hover:bg-sidebar-accent flex w-full items-center gap-2.5 rounded-lg px-3 py-2 text-sm dark:text-white"
+          >
+            <LogOut
+              className="text-muted-foreground size-4 shrink-0"
+              strokeWidth={1.75}
+            />
+            {t('auth.signOut')}
+          </button>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index 54706a87..8d91f741 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -36,7 +36,8 @@
     "signInWith": "Sign in with {{provider}}",
     "notAuthorized": "Your account isn't authorized to access this workspace. Sign in with a different account or contact your administrator.",
     "accountDisabled": "Your account has been disabled. Contact your administrator.",
-    "signOut": "Sign out"
+    "signOut": "Sign out",
+    "account": "Account"
   },
   "settings": {
     "label": "Settings",