diff --git a/ui/litellm-dashboard/.eslintrc.json b/ui/litellm-dashboard/.eslintrc.json
index 08fc6f5fd02..709a4352cd1 100644
--- a/ui/litellm-dashboard/.eslintrc.json
+++ b/ui/litellm-dashboard/.eslintrc.json
@@ -65,6 +65,7 @@
         "src/components/playground/chat_ui/SessionManagement.tsx",
         "src/components/playground/chat_ui/SearchResultsDisplay.tsx",
         "src/components/team/member_permissions.tsx",
+        "src/components/agent_management/AgentSelector.tsx",
         "src/components/UsagePage/components/EntityUsage/SpendByProvider.tsx",
         "src/components/view_logs/ToolsSection/FormattedToolView.tsx",
         "src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTable.tsx",
diff --git a/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx b/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx
index 4debf284732..0d0fad8a07b 100644
--- a/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx
+++ b/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx
@@ -1,23 +1,27 @@
-import React, { useEffect, useState } from "react";
-import { Select } from "antd";
+import { Badge } from "@/components/ui/badge";
+import { Input } from "@/components/ui/input";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+import { X } from "lucide-react";
+import React, { useEffect, useMemo, useState } from "react";
 import { getAgentsList } from "../networking";
 
 interface Agent {
   agent_id: string;
   agent_name: string;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   agent_config?: Record<string, any>;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   agent_card_params?: Record<string, any>;
 }
 
 interface AgentSelectorProps {
-  onChange: (selected: { 
-    agents: string[]; 
-    accessGroups: string[];
-  }) => void;
-  value?: { 
-    agents: string[]; 
-    accessGroups: string[];
-  };
+  onChange: (selected: { agents: string[]; accessGroups: string[] }) => void;
+  value?: { agents: string[]; accessGroups: string[] };
   className?: string;
   accessToken: string;
   placeholder?: string;
@@ -34,21 +38,22 @@ const AgentSelector: React.FC<AgentSelectorProps> = ({
 }) => {
   const [agents, setAgents] = useState<Agent[]>([]);
   const [accessGroups, setAccessGroups] = useState<string[]>([]);
-  const [loading, setLoading] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [query, setQuery] = useState("");
 
   useEffect(() => {
     const fetchData = async () => {
       if (!accessToken) return;
-      setLoading(true);
       try {
         const response = await getAgentsList(accessToken);
-        let agentsList = response?.agents || [];
+        const agentsList = response?.agents || [];
         setAgents(agentsList);
-        
-        // Extract unique access groups from agents
+
         const groups = new Set<string>();
         agentsList.forEach((agent: Agent) => {
-          const agentAccessGroups = (agent as any).agent_access_groups;
+          const agentAccessGroups =
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (agent as any).agent_access_groups as string[] | undefined;
           if (agentAccessGroups && Array.isArray(agentAccessGroups)) {
             agentAccessGroups.forEach((g: string) => groups.add(g));
           }
@@ -56,93 +61,154 @@ const AgentSelector: React.FC<AgentSelectorProps> = ({
         setAccessGroups(Array.from(groups));
       } catch (error) {
         console.error("Error fetching agents:", error);
-      } finally {
-        setLoading(false);
       }
     };
     fetchData();
   }, [accessToken]);
 
-  // Combine options, access groups first
-  const options = [
-    ...accessGroups.map((group) => ({
-      label: group,
-      value: `group:${group}`,
-      isAccessGroup: true,
-      searchText: `${group} Access Group`,
-    })),
-    ...agents.map((agent) => ({
-      label: `${agent.agent_name || agent.agent_id}`,
-      value: agent.agent_id,
-      isAccessGroup: false,
-      searchText: `${agent.agent_name || agent.agent_id} ${agent.agent_id} Agent`,
-    })),
-  ];
+  const options = useMemo(
+    () => [
+      ...accessGroups.map((group) => ({
+        label: group,
+        value: `group:${group}`,
+        isAccessGroup: true,
+        searchText: `${group} Access Group`,
+      })),
+      ...agents.map((agent) => ({
+        label: `${agent.agent_name || agent.agent_id}`,
+        value: agent.agent_id,
+        isAccessGroup: false,
+        searchText: `${agent.agent_name || agent.agent_id} ${agent.agent_id} Agent`,
+      })),
+    ],
+    [accessGroups, agents],
+  );
 
-  // Flatten value for Select
-  const selectedValues = [
-    ...(value?.agents || []),
-    ...(value?.accessGroups || []).map((g) => `group:${g}`),
-  ];
+  const selectedValues = useMemo(
+    () => [
+      ...(value?.agents || []),
+      ...(value?.accessGroups || []).map((g) => `group:${g}`),
+    ],
+    [value],
+  );
 
-  // Handle selection
-  const handleChange = (selected: string[]) => {
-    const agentsSelected = selected.filter((v) => !v.startsWith("group:"));
-    const accessGroupsSelected = selected
+  const filteredOptions = useMemo(
+    () =>
+      options
+        .filter((o) => !selectedValues.includes(o.value))
+        .filter((o) =>
+          query
+            ? o.searchText.toLowerCase().includes(query.toLowerCase())
+            : true,
+        ),
+    [options, selectedValues, query],
+  );
+
+  const labelFor = (v: string) =>
+    options.find((o) => o.value === v)?.label ?? v;
+  const isGroupFor = (v: string) =>
+    options.find((o) => o.value === v)?.isAccessGroup ?? false;
+
+  const applyChange = (next: string[]) => {
+    const agentsSelected = next.filter((v) => !v.startsWith("group:"));
+    const accessGroupsSelected = next
       .filter((v) => v.startsWith("group:"))
       .map((v) => v.replace("group:", ""));
     onChange({ agents: agentsSelected, accessGroups: accessGroupsSelected });
   };
 
   return (
-    <div>
-      <Select
-        mode="multiple"
-        placeholder={placeholder}
-        onChange={handleChange}
-        value={selectedValues}
-        loading={loading}
-        className={className}
-        allowClear
-        showSearch
-        style={{ width: "100%" }}
-        disabled={disabled}
-        filterOption={(input, option) => {
-          const searchText = options.find((opt) => opt.value === option?.value)?.searchText || "";
-          return searchText.toLowerCase().includes(input.toLowerCase());
-        }}
-      >
-        {options.map((opt) => (
-          <Select.Option key={opt.value} value={opt.value} label={opt.label}>
-            <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-              <span
-                style={{
-                  display: "inline-block",
-                  width: 8,
-                  height: 8,
-                  borderRadius: "50%",
-                  background: opt.isAccessGroup ? "#52c41a" : "#722ed1",
-                  flexShrink: 0,
-                }}
-              />
-              <span style={{ flex: 1 }}>{opt.label}</span>
-              <span
-                style={{
-                  color: opt.isAccessGroup ? "#52c41a" : "#722ed1",
-                  fontSize: "12px",
-                  fontWeight: 500,
-                  opacity: 0.8,
-                }}
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          disabled={disabled}
+          className={cn(
+            "min-h-9 w-full flex flex-wrap items-center gap-1 rounded-md border border-input bg-background px-2 py-1 text-sm text-left disabled:opacity-50",
+            className,
+          )}
+        >
+          {selectedValues.length === 0 ? (
+            <span className="text-muted-foreground px-1">{placeholder}</span>
+          ) : (
+            selectedValues.map((v) => (
+              <Badge
+                key={v}
+                variant="secondary"
+                className="gap-1 inline-flex items-center"
               >
-                {opt.isAccessGroup ? "Access Group" : "Agent"}
-              </span>
+                <span
+                  className={cn(
+                    "w-1.5 h-1.5 rounded-full inline-block",
+                    isGroupFor(v) ? "bg-emerald-500" : "bg-purple-500",
+                  )}
+                />
+                {labelFor(v)}
+                <span
+                  role="button"
+                  tabIndex={0}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    applyChange(selectedValues.filter((s) => s !== v));
+                  }}
+                  className="inline-flex items-center"
+                  aria-label={`Remove ${labelFor(v)}`}
+                >
+                  <X size={12} />
+                </span>
+              </Badge>
+            ))
+          )}
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        className="w-[var(--radix-popover-trigger-width)] p-2"
+      >
+        <Input
+          autoFocus
+          placeholder="Search agents, groups…"
+          value={query}
+          onChange={(e) => setQuery(e.target.value)}
+          className="h-8 mb-2"
+        />
+        <div className="max-h-60 overflow-y-auto">
+          {filteredOptions.length === 0 ? (
+            <div className="py-2 px-3 text-sm text-muted-foreground">
+              No matches
             </div>
-          </Select.Option>
-        ))}
-      </Select>
-    </div>
+          ) : (
+            filteredOptions.map((opt) => (
+              <button
+                key={opt.value}
+                type="button"
+                className="w-full text-left px-2 py-1.5 text-sm rounded hover:bg-accent flex items-center gap-2"
+                onClick={() => applyChange([...selectedValues, opt.value])}
+              >
+                <span
+                  className={cn(
+                    "w-2 h-2 rounded-full inline-block shrink-0",
+                    opt.isAccessGroup ? "bg-emerald-500" : "bg-purple-500",
+                  )}
+                />
+                <span className="flex-1 truncate">{opt.label}</span>
+                <span
+                  className={cn(
+                    "text-xs font-medium opacity-80",
+                    opt.isAccessGroup
+                      ? "text-emerald-700 dark:text-emerald-400"
+                      : "text-purple-700 dark:text-purple-400",
+                  )}
+                >
+                  {opt.isAccessGroup ? "Access Group" : "Agent"}
+                </span>
+              </button>
+            ))
+          )}
+        </div>
+      </PopoverContent>
+    </Popover>
   );
 };
 
 export default AgentSelector;
-