diff --git a/lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart b/lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart
index 0e08de53..9e2fee32 100644
--- a/lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart
+++ b/lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart
@@ -71,6 +71,7 @@ class AssignTagDialog extends StatelessWidget {
                       child: DataTable(
                         headingRowColor: WidgetStateProperty.all(
                             ColorsManager.dataHeaderGrey),
+                        key: ValueKey(state.tags.length),
                         border: TableBorder.all(
                           color: ColorsManager.dataHeaderGrey,
                           width: 1,
@@ -120,6 +121,7 @@ class AssignTagDialog extends StatelessWidget {
                                 final controller = controllers[index];
                                 final availableTags = getAvailableTags(
                                     allTags ?? [], state.tags, tag);
+
                                 return DataRow(
                                   cells: [
                                     DataCell(Text((index + 1).toString())),
@@ -158,6 +160,8 @@ class AssignTagDialog extends StatelessWidget {
                                                     .add(DeleteTag(
                                                         tagToDelete: tag,
                                                         tags: state.tags));
+
+                                                controllers.removeAt(index);
                                               },
                                               tooltip: 'Delete Tag',
                                               padding: EdgeInsets.zero,
@@ -255,6 +259,7 @@ class AssignTagDialog extends StatelessWidget {
                                 spaceTags: processedTags,
                                 isCreate: false,
                                 onSave: onSave,
+                                allTags: allTags,
                               ),
                             );
                           },
@@ -265,10 +270,10 @@ class AssignTagDialog extends StatelessWidget {
                     Expanded(
                       child: DefaultButton(
                         borderRadius: 10,
-                        backgroundColor: state.isSaveEnabled
-                            ? ColorsManager.secondaryColor
-                            : ColorsManager.grayColor,
-                        foregroundColor: ColorsManager.whiteColors,
+                        backgroundColor: ColorsManager.secondaryColor,
+                        foregroundColor: state.isSaveEnabled
+                            ? ColorsManager.whiteColors
+                            : ColorsManager.whiteColorsWithOpacity,
                         onPressed: state.isSaveEnabled
                             ? () async {
                                 final updatedTags = List<Tag>.from(state.tags);
diff --git a/lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart b/lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart
index 5fdaf937..3e302d2d 100644
--- a/lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart
+++ b/lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart
@@ -82,6 +82,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                           child: DataTable(
                             headingRowColor: WidgetStateProperty.all(
                                 ColorsManager.dataHeaderGrey),
+                            key: ValueKey(state.tags.length),
                             border: TableBorder.all(
                               color: ColorsManager.dataHeaderGrey,
                               width: 1,
@@ -176,6 +177,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                                                         .add(DeleteTagModel(
                                                             tagToDelete: tag,
                                                             tags: state.tags));
+                                                    controllers.removeAt(index);
                                                   },
                                                   tooltip: 'Delete Tag',
                                                   padding: EdgeInsets.zero,
@@ -302,10 +304,10 @@ class AssignTagModelsDialog extends StatelessWidget {
                         Expanded(
                           child: DefaultButton(
                             borderRadius: 10,
-                            backgroundColor: state.isSaveEnabled
-                                ? ColorsManager.secondaryColor
-                                : ColorsManager.grayColor,
-                            foregroundColor: ColorsManager.whiteColors,
+                            backgroundColor: ColorsManager.secondaryColor,
+                            foregroundColor: state.isSaveEnabled
+                                ? ColorsManager.whiteColors
+                                : ColorsManager.whiteColorsWithOpacity,
                             onPressed: state.isSaveEnabled
                                 ? () async {
                                     final updatedTags =