diff --git a/src/components/quicklaunch.jsx b/src/components/quicklaunch.jsx
index 5e307480..f71da9a0 100644
--- a/src/components/quicklaunch.jsx
+++ b/src/components/quicklaunch.jsx
@@ -161,7 +161,7 @@ export default function QuickLaunch({servicesAndBookmarks, searchString, setSear
               )} type="text" autoCorrect="false" ref={searchField} value={searchString} onChange={handleSearchChange} onKeyDown={handleSearchKeyDown} />
             {results.length > 0 && <ul className="max-h-[60vh] overflow-y-auto m-2">
               {results.map((r, i) => (
-                <li key={r.name}>
+                <li key={r.container ?? r.app ?? r.name}>
                   <button type="button" data-index={i} onMouseEnter={handleItemHover} className={classNames(
                     "flex flex-row w-full items-center justify-between rounded-md text-sm md:text-xl py-2 px-4 cursor-pointer text-theme-700 dark:text-theme-200",
                     i === currentItemIndex && "bg-theme-300/50 dark:bg-theme-700/50",
diff --git a/src/components/services/list.jsx b/src/components/services/list.jsx
index 80b45592..c8028df5 100644
--- a/src/components/services/list.jsx
+++ b/src/components/services/list.jsx
@@ -23,7 +23,7 @@ export default function List({ services, layout }) {
       )}
     >
       {services.map((service) => (
-        <Item key={service.name} service={service} />
+        <Item key={service.container ?? service.app ?? service.name} service={service} />
       ))}
     </ul>
   );