diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.test.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.test.tsx
new file mode 100644
index 0000000000..42e9768721
--- /dev/null
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.test.tsx
@@ -0,0 +1,89 @@
+import { payloadReducer } from './ManageBulkTagsDialog';
+
+describe('payloadReducer', () => {
+    it('should add a tag to addedTags and remove it from removedTags', () => {
+        const initialState = {
+            addedTags: [{ type: 'simple', value: 'A' }],
+            removedTags: [
+                { type: 'simple', value: 'B' },
+                { type: 'simple', value: 'C' },
+            ],
+        };
+
+        const action = {
+            type: 'add' as const,
+            payload: { type: 'simple', value: 'B' },
+        };
+
+        const newState = payloadReducer(initialState, action);
+
+        expect(newState).toMatchObject({
+            addedTags: [
+                { type: 'simple', value: 'A' },
+                { type: 'simple', value: 'B' },
+            ],
+            removedTags: [{ type: 'simple', value: 'C' }],
+        });
+    });
+
+    it('should remove a tag from addedTags and add it to removedTags', () => {
+        const initialState = {
+            addedTags: [
+                { type: 'simple', value: 'A' },
+                { type: 'simple', value: 'B' },
+            ],
+            removedTags: [{ type: 'simple', value: 'C' }],
+        };
+
+        const action = {
+            type: 'remove' as const,
+            payload: { type: 'simple', value: 'B' },
+        };
+
+        const newState = payloadReducer(initialState, action);
+
+        expect(newState).toMatchObject({
+            addedTags: [{ type: 'simple', value: 'A' }],
+            removedTags: [
+                { type: 'simple', value: 'C' },
+                { type: 'simple', value: 'B' },
+            ],
+        });
+    });
+
+    it('should empty addedTags and set removedTags to the payload on clear', () => {
+        const initialState = {
+            addedTags: [{ type: 'simple', value: 'A' }],
+            removedTags: [{ type: 'simple', value: 'B' }],
+        };
+
+        const action = {
+            type: 'clear' as const,
+            payload: [{ type: 'simple', value: 'C' }],
+        };
+
+        const newState = payloadReducer(initialState, action);
+
+        expect(newState).toMatchObject({
+            addedTags: [],
+            removedTags: [{ type: 'simple', value: 'C' }],
+        });
+    });
+
+    it('should empty both addedTags and removedTags on reset', () => {
+        const initialState = {
+            addedTags: [{ type: 'simple', value: 'test' }],
+            removedTags: [{ type: 'simple', value: 'test2' }],
+        };
+
+        const action = {
+            type: 'reset' as const,
+        };
+
+        const newState = payloadReducer(initialState, action);
+        expect(newState).toMatchObject({
+            addedTags: [],
+            removedTags: [],
+        });
+    });
+});
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.tsx
index 9881a6bfb4..0323cb3ddc 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/ManageBulkTagsDialog.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useReducer, useState, type VFC } from 'react';
+import { type FC, useEffect, useReducer, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import {
     type AutocompleteProps,
@@ -46,7 +46,7 @@ const mergeTags = (tags: ITag[], newTag: ITag) => [
 const filterTags = (tags: ITag[], tag: ITag) =>
     tags.filter((x) => !(x.value === tag.value && x.type === tag.type));
 
-const payloadReducer = (
+export const payloadReducer = (
     state: Payload,
     action:
         | {
@@ -56,7 +56,8 @@ const payloadReducer = (
         | {
               type: 'clear';
               payload: ITag[];
-          },
+          }
+        | { type: 'reset' },
 ) => {
     switch (action.type) {
         case 'add':
@@ -76,6 +77,11 @@ const payloadReducer = (
                 addedTags: [],
                 removedTags: action.payload,
             };
+        case 'reset':
+            return {
+                addedTags: [],
+                removedTags: [],
+            };
         default:
             return state;
     }
@@ -87,7 +93,7 @@ const emptyTagType = {
     icon: '',
 };
 
-export const ManageBulkTagsDialog: VFC<IManageBulkTagsDialogProps> = ({
+export const ManageBulkTagsDialog: FC<IManageBulkTagsDialogProps> = ({
     open,
     initialValues,
     initialIndeterminateValues,
@@ -106,6 +112,11 @@ export const ManageBulkTagsDialog: VFC<IManageBulkTagsDialogProps> = ({
         removedTags: [],
     });
 
+    const submitAndReset = () => {
+        onSubmit(payload);
+        dispatch({ type: 'reset' });
+    };
+
     const resetTagType = (
         tagType: ITagType = tagTypes.length > 0 ? tagTypes[0] : emptyTagType,
     ) => {
@@ -230,7 +241,7 @@ export const ManageBulkTagsDialog: VFC<IManageBulkTagsDialogProps> = ({
             secondaryButtonText='Cancel'
             primaryButtonText='Save tags'
             title='Update feature flag tags'
-            onClick={() => onSubmit(payload)}
+            onClick={submitAndReset}
             disabledPrimaryButton={
                 payload.addedTags.length === 0 &&
                 payload.removedTags.length === 0
@@ -244,7 +255,7 @@ export const ManageBulkTagsDialog: VFC<IManageBulkTagsDialogProps> = ({
             >
                 Tags allow you to group features together
             </Typography>
-            <form id={formId} onSubmit={() => onSubmit(payload)}>
+            <form id={formId} onSubmit={submitAndReset}>
                 <StyledDialogFormContent>
                     <TagTypeSelect
                         key={tagTypesLoading ? 'loading' : tagTypes.length}
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagTypeSelect.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagTypeSelect.tsx
index 05f196c6a1..1b1fd13ce1 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagTypeSelect.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagTypeSelect.tsx
@@ -7,6 +7,7 @@ import {
     useTheme,
 } from '@mui/material';
 import type { ITagType } from 'interfaces/tags';
+import type { HTMLAttributes } from 'react';
 
 interface ITagSelect {
     options: ITagType[];
@@ -37,8 +38,15 @@ export const TagTypeSelect = ({
             disableClearable
             value={value}
             getOptionLabel={(option) => option.name}
-            renderOption={(props, option) => (
+            renderOption={(
+                {
+                    key,
+                    ...props
+                }: JSX.IntrinsicAttributes & HTMLAttributes<HTMLLIElement>,
+                option,
+            ) => (
                 <ListItem
+                    key={key}
                     {...props}
                     style={{
                         alignItems: 'flex-start',
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagsInput.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagsInput.tsx
index 7ebdc202e7..f41794658f 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagsInput.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ManageTagsDialog/TagsInput.tsx
@@ -52,7 +52,10 @@ export const TagsInput = ({
     };
 
     const renderOption = (
-        props: JSX.IntrinsicAttributes &
+        {
+            key,
+            ...props
+        }: JSX.IntrinsicAttributes &
             React.ClassAttributes<HTMLLIElement> &
             React.LiHTMLAttributes<HTMLLIElement>,
         option: TagOption,
@@ -64,7 +67,7 @@ export const TagsInput = ({
                     indeterminateOption.title === option.title,
             ) ?? false;
         return (
-            <li {...props}>
+            <li key={key} {...props}>
                 <ConditionallyRender
                     condition={Boolean(option.inputValue)}
                     show={<Add sx={{ mr: (theme) => theme.spacing(0.5) }} />}