diff --git a/ui/litellm-dashboard/src/components/KeyAliasSelect/PaginatedKeyAliasSelect/PaginatedKeyAliasSelect.tsx b/ui/litellm-dashboard/src/components/KeyAliasSelect/PaginatedKeyAliasSelect/PaginatedKeyAliasSelect.tsx
index 940f0b7e951..aedccea6f16 100644
--- a/ui/litellm-dashboard/src/components/KeyAliasSelect/PaginatedKeyAliasSelect/PaginatedKeyAliasSelect.tsx
+++ b/ui/litellm-dashboard/src/components/KeyAliasSelect/PaginatedKeyAliasSelect/PaginatedKeyAliasSelect.tsx
@@ -1,8 +1,15 @@
 import { useInfiniteKeyAliases } from "@/app/(dashboard)/hooks/keys/useKeyAliases";
-import { LoadingOutlined } from "@ant-design/icons";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
 import { useDebouncedState } from "@tanstack/react-pacer/debouncer";
-import { Select } from "antd";
-import { useMemo, useState, type UIEvent } from "react";
+import { ChevronsUpDown, Loader2, X } from "lucide-react";
+import { useMemo, useRef, useState } from "react";
 
 export interface PaginatedKeyAliasSelectProps {
   value?: string;
@@ -28,39 +35,36 @@ export const PaginatedKeyAliasSelect = ({
   disabled = false,
   allFilters,
 }: PaginatedKeyAliasSelectProps) => {
+  const [open, setOpen] = useState(false);
   const [searchInput, setSearchInput] = useState("");
   const [debouncedSearch, setDebouncedSearch] = useDebouncedState("", {
     wait: DEBOUNCE_MS,
   });
+  const listRef = useRef<HTMLDivElement>(null);
 
   const teamId = allFilters?.["Team ID"] || undefined;
 
-  const {
-    data,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-    isLoading,
-  } = useInfiniteKeyAliases(pageSize, debouncedSearch || undefined, teamId);
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isLoading } =
+    useInfiniteKeyAliases(pageSize, debouncedSearch || undefined, teamId);
 
   const options = useMemo(() => {
     if (!data?.pages) return [];
 
     const seen = new Set<string>();
-    const result: { label: string; value: string }[] = [];
+    const result: string[] = [];
 
     for (const page of data.pages) {
       for (const alias of page.aliases) {
         if (!alias || seen.has(alias)) continue;
         seen.add(alias);
-        result.push({ label: alias, value: alias });
+        result.push(alias);
       }
     }
 
     return result;
   }, [data]);
 
-  const handlePopupScroll = (e: UIEvent<HTMLDivElement>) => {
+  const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
     const target = e.currentTarget;
     const scrollRatio =
       (target.scrollTop + target.clientHeight) / target.scrollHeight;
@@ -70,41 +74,101 @@ export const PaginatedKeyAliasSelect = ({
     }
   };
 
-  const handleSearch = (value: string) => {
-    setSearchInput(value);
-    setDebouncedSearch(value);
+  const handleSearch = (v: string) => {
+    setSearchInput(v);
+    setDebouncedSearch(v);
   };
 
-  const handleChange = (v: string | null) => {
-    onChange?.(v ?? "");
+  const select = (alias: string) => {
+    onChange?.(alias);
+    setOpen(false);
+  };
+
+  const clear = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    onChange?.("");
   };
 
   return (
-    <Select
-      value={value || undefined}
-      onChange={handleChange}
-      placeholder={placeholder}
-      style={{ width: "100%", ...style }}
-      allowClear={allowClear}
-      disabled={disabled}
-      showSearch
-      filterOption={false}
-      onSearch={handleSearch}
-      searchValue={searchInput}
-      onPopupScroll={handlePopupScroll}
-      loading={isLoading}
-      notFoundContent={isLoading ? <LoadingOutlined spin /> : "No key aliases found"}
-      options={options}
-      popupRender={(menu) => (
-        <>
-          {menu}
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant="outline"
+          role="combobox"
+          aria-expanded={open}
+          disabled={disabled}
+          style={style}
+          className="w-full justify-between"
+        >
+          {value ? (
+            <span className="truncate">{value}</span>
+          ) : (
+            <span className="text-muted-foreground">{placeholder}</span>
+          )}
+          <div className="ml-2 flex items-center gap-1 shrink-0">
+            {allowClear && value && (
+              <span
+                role="button"
+                tabIndex={0}
+                onClick={clear}
+                className="text-muted-foreground hover:text-foreground"
+                aria-label="Clear"
+              >
+                <X className="h-3.5 w-3.5" />
+              </span>
+            )}
+            <ChevronsUpDown className="h-4 w-4 opacity-50" />
+          </div>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent
+        className="w-[var(--radix-popover-trigger-width)] p-0"
+        align="start"
+      >
+        <div className="p-2 border-b">
+          <Input
+            autoFocus
+            placeholder="Search key aliases…"
+            value={searchInput}
+            onChange={(e) => handleSearch(e.target.value)}
+            className="h-8"
+          />
+        </div>
+        <div
+          ref={listRef}
+          onScroll={handleScroll}
+          className="max-h-60 overflow-y-auto p-1"
+        >
+          {isLoading && options.length === 0 ? (
+            <div className="flex items-center justify-center py-6">
+              <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
+            </div>
+          ) : options.length === 0 ? (
+            <div className="py-6 text-center text-sm text-muted-foreground">
+              No key aliases found
+            </div>
+          ) : (
+            options.map((alias) => (
+              <button
+                key={alias}
+                type="button"
+                onClick={() => select(alias)}
+                className={cn(
+                  "w-full text-left px-2 py-1.5 text-sm rounded hover:bg-accent",
+                  value === alias && "bg-accent",
+                )}
+              >
+                {alias}
+              </button>
+            ))
+          )}
           {isFetchingNextPage && (
-            <div style={{ textAlign: "center", padding: 8 }}>
-              <LoadingOutlined spin />
+            <div className="flex items-center justify-center py-2">
+              <Loader2 className="h-3.5 w-3.5 animate-spin text-muted-foreground" />
             </div>
           )}
-        </>
-      )}
-    />
+        </div>
+      </PopoverContent>
+    </Popover>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/common_components/chartUtils.tsx b/ui/litellm-dashboard/src/components/common_components/chartUtils.tsx
index c0930f290f6..7567a14a454 100644
--- a/ui/litellm-dashboard/src/components/common_components/chartUtils.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/chartUtils.tsx
@@ -1,3 +1,4 @@
+// eslint-disable-next-line litellm-ui/no-banned-ui-imports
 import type { CustomTooltipProps } from "@tremor/react";
 import { SpendMetrics } from "../UsagePage/types";