diff --git a/packages/web/pages/settings/labels.tsx b/packages/web/pages/settings/labels.tsx
index 03579e8bb..dbd81ed95 100644
--- a/packages/web/pages/settings/labels.tsx
+++ b/packages/web/pages/settings/labels.tsx
@@ -412,9 +412,16 @@ export default function LabelsPage(): JSX.Element {
 
                 if (editingLabelId == label.id) {
                   if (windowWidth >= breakpoint) {
-                    return <DesktopEditCard {...cardProps} />
+                    return (
+                      <DesktopEditCard
+                        key={`edit-${label.id}`}
+                        {...cardProps}
+                      />
+                    )
                   } else {
-                    return <MobileEditCard {...cardProps} />
+                    return (
+                      <MobileEditCard key={`edit-${label.id}`} {...cardProps} />
+                    )
                   }
                 }
 
diff --git a/packages/web/pages/settings/saved-searches.tsx b/packages/web/pages/settings/saved-searches.tsx
index 5c5cc8e43..0117c95cc 100644
--- a/packages/web/pages/settings/saved-searches.tsx
+++ b/packages/web/pages/settings/saved-searches.tsx
@@ -488,9 +488,19 @@ export default function SavedSearchesPage(): JSX.Element {
                 }
                 if (editingId == savedSearch.id) {
                   if (windowWidth >= breakpoint) {
-                    return <DesktopEditCard {...cardProps} />
+                    return (
+                      <DesktopEditCard
+                        key={`edit-${savedSearch.id}`}
+                        {...cardProps}
+                      />
+                    )
                   } else {
-                    return <MobileEditCard {...cardProps} />
+                    return (
+                      <MobileEditCard
+                        key={`edit-${savedSearch.id}`}
+                        {...cardProps}
+                      />
+                    )
                   }
                 }
 
@@ -569,15 +579,14 @@ function GenericTableCard(
     editingId === savedSearch?.id || (isCreateMode && !savedSearch)
   const iconColor = isDarkTheme() ? '#D8D7D5' : '#5F5E58'
   const DEFAULT_STYLE = { position: null }
-  const [style, setStyle] =
-    useState<
-      Partial<{
-        position: string | null
-        top: string
-        left: string
-        maxWidth: string
-      }>
-    >(DEFAULT_STYLE)
+  const [style, setStyle] = useState<
+    Partial<{
+      position: string | null
+      top: string
+      left: string
+      maxWidth: string
+    }>
+  >(DEFAULT_STYLE)
   const handleEdit = () => {
     editingId && updateSavedSearch(editingId)
     setEditingId(null)