diff --git a/web/src/components/filter/CameraGroupSelector.tsx b/web/src/components/filter/CameraGroupSelector.tsx
index d1a34ed6d..fdb01c5ee 100644
--- a/web/src/components/filter/CameraGroupSelector.tsx
+++ b/web/src/components/filter/CameraGroupSelector.tsx
@@ -378,7 +378,13 @@ function NewGroupDialog({
 
           {editState != "none" && (
             <>
-              <Header className="mt-2" onClose={() => setEditState("none")}>
+              <Header
+                className="mt-2"
+                onClose={() => {
+                  setEditState("none");
+                  setEditingGroupName("");
+                }}
+              >
                 <Title>
                   {editState == "add" ? "Add" : "Edit"} Camera Group
                 </Title>