diff --git a/packages/shadcn-registry/components/ui/popover.tsx b/packages/shadcn-registry/components/ui/popover.tsx
deleted file mode 100644
index 3adf73d02..000000000
--- a/packages/shadcn-registry/components/ui/popover.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-"use client";
-
-import * as PopoverPrimitive from "@radix-ui/react-popover";
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const Popover = PopoverPrimitive.Root;
-
-const PopoverTrigger = PopoverPrimitive.Trigger;
-
-const PopoverAnchor = PopoverPrimitive.Anchor;
-
-const PopoverContent = React.forwardRef<
-  React.ElementRef<typeof PopoverPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
-  <PopoverPrimitive.Portal>
-    <PopoverPrimitive.Content
-      ref={ref}
-      align={align}
-      sideOffset={sideOffset}
-      className={cn(
-        "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 bg-popover text-popover-foreground data-[state=closed]:animate-out data-[state=open]:animate-in z-50 w-72 rounded-md border p-4 shadow-md outline-none",
-        className,
-      )}
-      {...props}
-    />
-  </PopoverPrimitive.Portal>
-));
-PopoverContent.displayName = PopoverPrimitive.Content.displayName;
-
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
diff --git a/packages/shadcn-registry/registry/assistant-ui/assistant-modal.tsx b/packages/shadcn-registry/registry/assistant-ui/assistant-modal.tsx
index acb380ce4..2211017db 100644
--- a/packages/shadcn-registry/registry/assistant-ui/assistant-modal.tsx
+++ b/packages/shadcn-registry/registry/assistant-ui/assistant-modal.tsx
@@ -4,11 +4,6 @@ import { BotIcon, ChevronDownIcon } from "lucide-react";
 
 import { Thread } from "@/components/ui/assistant-ui/thread";
 import { Button } from "@/components/ui/button";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
 import {
   Tooltip,
   TooltipContent,
@@ -16,25 +11,23 @@ import {
 } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import { TooltipProvider } from "@radix-ui/react-tooltip";
-import { useState, forwardRef } from "react";
+import { forwardRef } from "react";
+import { AssistantModalPrimitive } from "@assistant-ui/react";
 
 export const AssistantModal = () => {
-  const [open, setOpen] = useState(false);
-
   return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
+    <AssistantModalPrimitive.Root>
+      <AssistantModalPrimitive.Trigger asChild>
         <FloatingAssistantButton />
-      </PopoverTrigger>
-      <PopoverContent
-        onInteractOutside={(e) => e.preventDefault()}
-        side="top"
-        align="end"
-        className="mb-3 h-[500px] w-[400px] rounded-xl p-0"
+      </AssistantModalPrimitive.Trigger>
+      <AssistantModalPrimitive.Content
+        className={
+          "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 slide-in-from-bottom-2 bg-popover text-popover-foreground data-[state=closed]:animate-out data-[state=open]:animate-in z-50 mb-3 h-[500px] w-[400px] rounded-xl border p-0 shadow-md outline-none"
+        }
       >
         <Thread />
-      </PopoverContent>
-    </Popover>
+      </AssistantModalPrimitive.Content>
+    </AssistantModalPrimitive.Root>
   );
 };
 
@@ -45,6 +38,7 @@ const FloatingAssistantButton = forwardRef<
   FloatingAssistantButtonProps
 >(({ "data-state": state, ...rest }, ref) => {
   const tooltip = state === "open" ? "Close Assistant" : "Open Assistant";
+
   return (
     <TooltipProvider>
       <Tooltip>