diff --git a/src/components/input/chip-input.tsx b/src/components/input/chip-input.tsx
index c95b23c8f..d7d020cc6 100644
--- a/src/components/input/chip-input.tsx
+++ b/src/components/input/chip-input.tsx
@@ -1,6 +1,8 @@
-import { XIcon } from "@phosphor-icons/react";
+import { PencilSimpleIcon, XIcon } from "@phosphor-icons/react";
+import { motion, Reorder, useDragControls } from "motion/react";
 import * as React from "react";
 import { Badge } from "@/components/ui/badge";
+import { Input } from "@/components/ui/input";
 import { useControlledState } from "@/hooks/use-controlled-state";
 import { cn } from "@/utils/style";
 
@@ -10,6 +12,79 @@ type Props = Omit<React.ComponentProps<"div">, "value" | "onChange"> & {
 	onChange?: (value: string[]) => void;
 };
 
+type ChipItemProps = {
+	chip: string;
+	index: number;
+	isEditing: boolean;
+	onEdit: (index: number) => void;
+	onRemove: (index: number) => void;
+};
+
+function ChipItem({ chip, index, isEditing, onEdit, onRemove }: ChipItemProps) {
+	const controls = useDragControls();
+	const [isHovered, setIsHovered] = React.useState(false);
+
+	return (
+		<Reorder.Item
+			value={chip}
+			dragListener={false}
+			dragControls={controls}
+			initial={{ opacity: 1, scale: 0.9 }}
+			animate={{ opacity: 1, scale: 1 }}
+			exit={{ opacity: 0, scale: 0.9 }}
+			className="relative"
+			onMouseEnter={() => setIsHovered(true)}
+			onMouseLeave={() => setIsHovered(false)}
+		>
+			<Badge
+				variant="outline"
+				className={cn(
+					"flex h-7 cursor-grab select-none items-center gap-0 overflow-hidden px-3 active:cursor-grabbing",
+					isEditing && "border-primary ring-1 ring-primary",
+				)}
+				onPointerDown={(e) => {
+					e.preventDefault();
+					controls.start(e);
+				}}
+			>
+				<span className="max-w-32 truncate">{chip}</span>
+
+				<motion.div
+					initial={false}
+					animate={{ width: isHovered ? 40 : 0, marginInlineStart: isHovered ? 8 : 0, opacity: isHovered ? 1 : 0 }}
+					transition={{ duration: 0.15, ease: "linear" }}
+					className="flex shrink-0 items-center gap-x-1 overflow-hidden"
+				>
+					<button
+						type="button"
+						tabIndex={-1}
+						aria-label={`Edit ${chip}`}
+						onClick={(e) => {
+							e.stopPropagation();
+							onEdit(index);
+						}}
+						className="rounded-sm p-0.5 hover:bg-secondary hover:text-foreground focus:outline-none"
+					>
+						<PencilSimpleIcon className="size-3.5" />
+					</button>
+					<button
+						type="button"
+						tabIndex={-1}
+						aria-label={`Remove ${chip}`}
+						onClick={(e) => {
+							e.stopPropagation();
+							onRemove(index);
+						}}
+						className="rounded-sm p-0.5 hover:bg-destructive/10 hover:text-destructive focus:outline-none"
+					>
+						<XIcon className="size-3.5" />
+					</button>
+				</motion.div>
+			</Badge>
+		</Reorder.Item>
+	);
+}
+
 export function ChipInput({ value, defaultValue = [], onChange, className, ...props }: Props) {
 	const [chips, setChips] = useControlledState<string[]>({
 		value,
@@ -18,6 +93,7 @@ export function ChipInput({ value, defaultValue = [], onChange, className, ...pr
 	});
 
 	const [input, setInput] = React.useState("");
+	const [editingIndex, setEditingIndex] = React.useState<number | null>(null);
 	const inputRef = React.useRef<HTMLInputElement>(null);
 
 	const addChip = React.useCallback(
@@ -30,18 +106,82 @@ export function ChipInput({ value, defaultValue = [], onChange, className, ...pr
 		[chips, setChips],
 	);
 
+	const updateChip = React.useCallback(
+		(index: number, newValue: string) => {
+			const trimmed = newValue.trim();
+			if (!trimmed || index < 0 || index >= chips.length) return;
+
+			// Check if the new value already exists at a different index
+			const existingIndex = chips.findIndex((c, i) => c === trimmed && i !== index);
+			if (existingIndex !== -1) return;
+
+			const newChips = [...chips];
+			newChips[index] = trimmed;
+			setChips(newChips);
+		},
+		[chips, setChips],
+	);
+
 	const removeChip = React.useCallback(
 		(index: number) => {
 			if (index < 0 || index >= chips.length) return;
 			const newChips = chips.slice(0, index).concat(chips.slice(index + 1));
-			setChips(Array.from(new Set(newChips)));
+			setChips(newChips);
+
+			// If we were editing this chip, clear edit mode
+			if (editingIndex === index) {
+				setEditingIndex(null);
+				setInput("");
+			} else if (editingIndex !== null && editingIndex > index) {
+				// Adjust editing index if we removed a chip before it
+				setEditingIndex(editingIndex - 1);
+			}
 		},
-		[chips, setChips],
+		[chips, setChips, editingIndex],
+	);
+
+	const handleEdit = React.useCallback(
+		(index: number) => {
+			setEditingIndex(index);
+			setInput(chips[index]);
+			inputRef.current?.focus();
+		},
+		[chips],
+	);
+
+	const handleReorder = React.useCallback(
+		(newOrder: string[]) => {
+			// Update editingIndex to follow the chip being edited
+			if (editingIndex !== null) {
+				const editingChip = chips[editingIndex];
+				const newIndex = newOrder.indexOf(editingChip);
+				if (newIndex !== -1 && newIndex !== editingIndex) {
+					setEditingIndex(newIndex);
+				}
+			}
+			setChips(newOrder);
+		},
+		[chips, editingIndex, setChips],
 	);
 
 	const handleInputChange = React.useCallback(
 		(e: React.ChangeEvent<HTMLInputElement>) => {
 			const newValue = e.target.value;
+
+			// When editing, don't split on comma - allow full text editing
+			if (editingIndex !== null) {
+				if (newValue.includes(",")) {
+					// Save current edit
+					updateChip(editingIndex, newValue.replace(",", ""));
+					setEditingIndex(null);
+					setInput("");
+				} else {
+					setInput(newValue);
+				}
+				return;
+			}
+
+			// When adding new chips, split on comma
 			if (newValue.includes(",")) {
 				const parts = newValue.split(",");
 				parts.slice(0, -1).forEach(addChip);
@@ -50,74 +190,65 @@ export function ChipInput({ value, defaultValue = [], onChange, className, ...pr
 				setInput(newValue);
 			}
 		},
-		[addChip],
+		[addChip, editingIndex, updateChip],
 	);
 
-	const removeLastChip = React.useCallback(() => {
-		if (chips.length === 0) return;
-		const newChips = chips.slice(0, -1);
-		setChips(newChips);
-	}, [chips, setChips]);
-
 	const handleKeyDown = React.useCallback(
 		(e: React.KeyboardEvent<HTMLInputElement>) => {
-			if ((e.key === "Enter" || e.key === ",") && input.trim() !== "") {
+			if (e.key === "Enter" || e.key === ",") {
 				e.preventDefault();
-				addChip(input);
+
+				if (editingIndex !== null) {
+					// Save edit
+					if (input.trim()) {
+						updateChip(editingIndex, input);
+					}
+					setEditingIndex(null);
+					setInput("");
+				} else if (input.trim()) {
+					// Add new chip
+					addChip(input);
+					setInput("");
+				}
+			} else if (e.key === "Escape" && editingIndex !== null) {
+				// Cancel edit
+				setEditingIndex(null);
 				setInput("");
-			} else if (e.key === "Backspace" && input === "") {
-				removeLastChip();
 			}
 		},
-		[input, addChip, removeLastChip],
+		[input, addChip, editingIndex, updateChip],
 	);
 
-	const handleWrapperClick = React.useCallback(() => {
-		inputRef.current?.focus();
-	}, []);
-
 	return (
-		<div
-			tabIndex={-1}
-			onClick={handleWrapperClick}
-			className={cn(
-				"flex min-h-9 flex-wrap items-center gap-1.5 rounded-md border bg-background px-3 py-1.5 focus-within:border-ring focus-within:ring-[3px] focus-within:ring-ring/50",
-				className,
+		<div className={cn("flex flex-col gap-2", className)} {...props}>
+			{chips.length > 0 && (
+				<Reorder.Group axis="x" values={chips} onReorder={handleReorder} className="flex flex-wrap gap-1.5">
+					{chips.map((chip, idx) => (
+						<ChipItem
+							key={chip}
+							chip={chip}
+							index={idx}
+							isEditing={editingIndex === idx}
+							onEdit={handleEdit}
+							onRemove={removeChip}
+						/>
+					))}
+				</Reorder.Group>
 			)}
-			{...props}
-		>
-			<div className="flex flex-wrap items-center gap-1.5">
-				{chips.map((chip, idx) => (
-					<div key={chip + idx} className="relative">
-						<Badge variant="outline" className="flex select-none items-center gap-1 ps-2 pe-1">
-							<span>{chip}</span>
-							<button
-								type="button"
-								tabIndex={-1}
-								aria-label={`Remove ${chip}`}
-								onClick={(e) => {
-									e.stopPropagation();
-									removeChip(idx);
-								}}
-								className="ms-0.5 hover:text-destructive focus:outline-none"
-							>
-								<XIcon className="size-3" />
-							</button>
-						</Badge>
-					</div>
-				))}
-			</div>
 
-			<input
-				type="text"
-				value={input}
-				ref={inputRef}
-				autoComplete="off"
-				aria-label="Add chip"
-				onKeyDown={handleKeyDown}
-				onChange={handleInputChange}
-				className="min-w-0 grow border-none bg-transparent outline-none focus:outline-none focus:ring-0"
-			/>
+			<div className="flex flex-col gap-1">
+				<Input
+					ref={inputRef}
+					type="text"
+					value={input}
+					autoComplete="off"
+					aria-label={editingIndex !== null ? "Edit keyword" : "Add keyword"}
+					placeholder={editingIndex !== null ? "Editing keyword..." : "Add a keyword..."}
+					onKeyDown={handleKeyDown}
+					onChange={handleInputChange}
+				/>
+				<p className="text-muted-foreground text-xs">Press Enter or comma to save your keyword</p>
+			</div>
 		</div>
 	);
 }