diff --git a/app/src/app/[lng]/[inventory]/InventoryResultTab/EmissionBySectorChart.tsx b/app/src/app/[lng]/[inventory]/InventoryResultTab/EmissionBySectorChart.tsx
index eeb550e8f..1d1b223d2 100644
--- a/app/src/app/[lng]/[inventory]/InventoryResultTab/EmissionBySectorChart.tsx
+++ b/app/src/app/[lng]/[inventory]/InventoryResultTab/EmissionBySectorChart.tsx
@@ -216,7 +216,6 @@ const EmissionBySectorChart: React.FC<EmissionBySectorChartProps> = ({
   data,
   lng,
 }) => {
-  const { hideTooltip, showTooltipFromEvent } = useTooltip();
   const { t: tData } = useTranslation(lng, "data");
   const defaultBreakdown = SECTORS.reduce((acc, sector) => {
     return {
diff --git a/app/src/components/ChatBot/chat-popover.tsx b/app/src/components/ChatBot/chat-popover.tsx
index 84bc47d1a..db72d6ab3 100644
--- a/app/src/components/ChatBot/chat-popover.tsx
+++ b/app/src/components/ChatBot/chat-popover.tsx
@@ -1,13 +1,7 @@
 "use client";
 
-import {
-  Icon,
-  IconButton,
-  PopoverHeader,
-  useDisclosure,
-} from "@chakra-ui/react";
+import { Icon, PopoverHeader, useDisclosure } from "@chakra-ui/react";
 import React from "react";
-import { BsStars } from "react-icons/bs";
 import ChatBot from "./chat-bot";
 import { useTranslation } from "@/i18n/client";
 import { AskAiIcon } from "../icons";
@@ -17,11 +11,11 @@ import {
   PopoverCloseTrigger,
   PopoverContent,
   PopoverRoot,
-  PopoverTitle,
   PopoverTrigger,
 } from "@/components/ui/popover";
 
 import { Button } from "@/components/ui/button";
+import { OpenChangeDetails } from "@zag-js/popover";
 
 export default function ChatPopover({
   lng = "en",
@@ -35,27 +29,23 @@ export default function ChatPopover({
   const inputRef = React.useRef(null);
   const { t } = useTranslation(lng, "chat");
 
+  const onOpenChange = (e: OpenChangeDetails) => {
+    if (!e.open) {
+      onClose();
+    } else {
+      onOpen();
+    }
+  };
+
   return (
     <>
       <PopoverRoot
         open={open}
         initialFocusEl={() => inputRef.current}
-        onOpenChange={onOpen}
+        onOpenChange={onOpenChange}
         positioning={{
           placement: "top-end",
         }}
-        // closeOnBlur={false}
-        // strategy="fixed"
-        // modifiers={[
-        //   {
-        //     name: "zIndex",
-        //     enabled: true,
-        //     phase: "write",
-        //     fn: ({ state }) => {
-        //       state.elements.popper.style.zIndex = "9999";
-        //     },
-        //   },
-        // ]}
       >
         <PopoverTrigger asChild>
           <Button