diff --git a/packages/management-api/src/management-service.ts b/packages/management-api/src/management-service.ts
index 7d051fbf..af9fb90c 100644
--- a/packages/management-api/src/management-service.ts
+++ b/packages/management-api/src/management-service.ts
@@ -290,7 +290,7 @@ export class ManagementService extends EventEmitter {
   }
 
   private connectionKeyName(pod: ManagedPod, container: Container) {
-    return `${pod.getMetadata()?.name}-${container.name}`
+    return `${pod.getMetadata()?.namespace}-${pod.getMetadata()?.name}-${container.name}`
   }
 
   refreshConnections(pod: ManagedPod): string[] {
diff --git a/packages/online-shell/src/discover/DiscoverGroupList.tsx b/packages/online-shell/src/discover/DiscoverGroupList.tsx
index ac95b8d1..1e7990a0 100644
--- a/packages/online-shell/src/discover/DiscoverGroupList.tsx
+++ b/packages/online-shell/src/discover/DiscoverGroupList.tsx
@@ -24,8 +24,9 @@ export const DiscoverGroupList: React.FunctionComponent = () => {
   return (
     <Accordion asDefinitionList>
       {discoverGroups.map(group => {
+        const key = `${group.name}-${group.namespace}`
         return (
-          <AccordionItem key={'item-' + group.name}>
+          <AccordionItem key={'item-' + key}>
             <AccordionToggle
               onClick={() => {
                 onToggle(group)
@@ -35,7 +36,7 @@ export const DiscoverGroupList: React.FunctionComponent = () => {
             >
               <DiscoverGroupLabel group={group} />
             </AccordionToggle>
-            <AccordionContent id={'item-' + group.name + 'expand'} isHidden={!group.expanded}>
+            <AccordionContent id={'item-' + key + 'expand'} isHidden={!group.expanded}>
               <List isBordered={true} iconSize='large'>
                 {group.replicas.map(replica => (
                   <DiscoverPodItem key={replica.uid} pod={replica} />