diff --git a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx
index 250e04067..df1f30d2a 100644
--- a/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx
+++ b/packages/contact-center/cc-components/src/components/task/CallControl/call-control.tsx
@@ -150,22 +150,6 @@ function CallControlComponent(props: CallControlComponentProps) {
     }
   };
 
-  const handlePopoverOpen = (menuType: CallControlMenuType) => {
-    logger.info('CC-Widgets: CallControl: opening call control popover', {
-      module: 'call-control.tsx',
-      method: 'handlePopoverOpen',
-    });
-    if (showAgentMenu && agentMenuType === menuType) {
-      setShowAgentMenu(false);
-      setAgentMenuType(null);
-    } else {
-      setAgentMenuType(menuType);
-      setShowAgentMenu(true);
-      loadBuddyAgents();
-      loadQueues();
-    }
-  };
-
   const currentMediaType = getMediaTypeInfo(
     currentTask.data.interaction.mediaType as MediaChannelType,
     currentTask.data.interaction.mediaChannel as MediaChannelType
@@ -262,6 +246,16 @@ function CallControlComponent(props: CallControlComponentProps) {
                 return (
                   <PopoverNext
                     key={index}
+                    onShow={() => {
+                      logger.info(`CC-Widgets: CallControl: showing consult-transfer popover`, {
+                        module: 'call-control.tsx',
+                        method: 'onShowPopover',
+                      });
+                      setShowAgentMenu(true);
+                      setAgentMenuType(button.menuType as CallControlMenuType);
+                      loadBuddyAgents();
+                      loadQueues();
+                    }}
                     onHide={() => {
                       setShowAgentMenu(false);
                       setAgentMenuType(null);
@@ -293,7 +287,6 @@ function CallControlComponent(props: CallControlComponentProps) {
                             aria-label={button.tooltip}
                             disabled={button.disabled || (consultInitiated && isTelephony)}
                             data-testid={button.dataTestId}
-                            onPress={() => handlePopoverOpen(button.menuType as CallControlMenuType)}
                           >
                             <Icon className={button.className + '-icon'} name={button.icon} />
                           </ButtonCircle>
diff --git a/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx b/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx
index 37c6e675e..7ec913b67 100644
--- a/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx
+++ b/packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx
@@ -12,7 +12,7 @@ const TaskListComponent: React.FunctionComponent<TaskListComponentProps> = (prop
   return (
     <ul className="task-list" data-testid="task-list">
       {Object.values(taskList)?.map((task, index) => {
-        //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762IT
+        //@ts-expect-error  To be fixed in SDK - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6762
         const callAssociationDetails = task?.data?.interaction?.callAssociatedDetails;
         const ani = callAssociationDetails?.ani;
         const customerName = callAssociationDetails?.customerName;