diff --git a/src/frontend/src/i18n/useLanguageLabels.ts b/src/frontend/src/i18n/useLanguageLabels.ts
index aa2f10e2..31980bb5 100644
--- a/src/frontend/src/i18n/useLanguageLabels.ts
+++ b/src/frontend/src/i18n/useLanguageLabels.ts
@@ -13,6 +13,7 @@ export const useLanguageLabels = () => {
     (lang) => lang !== 'cimode'
   )
   const languagesList = supportedLanguages.map((lang) => ({
+    key: lang,
     value: lang,
     label: languageLabels[lang],
   }))
diff --git a/src/frontend/src/layout/Header.tsx b/src/frontend/src/layout/Header.tsx
index 36fc41c7..103f4bab 100644
--- a/src/frontend/src/layout/Header.tsx
+++ b/src/frontend/src/layout/Header.tsx
@@ -74,7 +74,7 @@ export const Header = () => {
                   {user.email}
                 </Button>
                 <PopoverList
-                  items={[{ value: 'logout', label: t('logout') }]}
+                  items={[{ key: 'logout', value: 'logout', label: t('logout') }]}
                   onAction={(value) => {
                     if (value === 'logout') {
                       window.location.href = logoutUrl()
diff --git a/src/frontend/src/primitives/PopoverList.tsx b/src/frontend/src/primitives/PopoverList.tsx
index 61d74fc4..fd393d0c 100644
--- a/src/frontend/src/primitives/PopoverList.tsx
+++ b/src/frontend/src/primitives/PopoverList.tsx
@@ -42,7 +42,7 @@ export const PopoverList = <T extends string | number = string>({
 }: {
   closeOnAction?: boolean
   onAction: (key: T) => void
-  items: Array<string | { value: T; label: ReactNode }>
+  items: Array<string | { key: string, value: T; label: ReactNode }>
 } & ButtonProps) => {
   const popoverState = useContext(OverlayTriggerStateContext)!
   return (
@@ -50,8 +50,9 @@ export const PopoverList = <T extends string | number = string>({
       {items.map((item) => {
         const value = typeof item === 'string' ? item : item.value
         const label = typeof item === 'string' ? item : item.label
+        const key = typeof item === 'string' ? item : item.key
         return (
-          <li>
+          <li key={key}>
             <ListItem
               key={value}
               onPress={() => {