diff --git a/src/components/features/query/popovers/filter-rows.tsx b/src/components/features/query/popovers/filter-rows.tsx
index 7c92ec0..f8b690b 100644
--- a/src/components/features/query/popovers/filter-rows.tsx
+++ b/src/components/features/query/popovers/filter-rows.tsx
@@ -9,7 +9,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Input } from "@/components/ui/input";
-import { X, Plus } from "lucide-react";
+import { X, Plus, Pencil } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import type { FilterRowsSelection } from "@/lib/firebase/types";
@@ -87,6 +87,14 @@ export function FilterRows({
     onRemoveFilter(filterId);
   };
 
+  const handleEditFilter = (filter: FilterRowsSelection) => {
+    setNewFilterColumn(filter.filterColumn);
+    setNewFilterCondition(filter.filterCondition);
+    setNewFilterValue(filter.filterValue);
+    setNewFilterOperator(filter.logicalOperator || 'AND');
+    onRemoveFilter(filter.id);
+  };
+
   const getFilterDisplayText = (filter: FilterRowsSelection) => {
     const conditionLabel = CONDITION_OPTIONS[columnTypes[filter.filterColumn] || "string"]
       ?.find(opt => opt.value === filter.filterCondition)?.label || filter.filterCondition;
@@ -165,6 +173,14 @@ export function FilterRows({
                     <span className="flex-1 px-2 text-xs">
                       {getFilterDisplayText(filter)}
                     </span>
+                    <Button
+                      size="icon"
+                      variant="ghost"
+                      onClick={() => handleEditFilter(filter)}
+                      className="h-6 w-6"
+                    >
+                      <Pencil className="h-3 w-3" />
+                    </Button>
                     <Button
                       size="icon"
                       variant="ghost"