diff --git a/lib/features/mailbox_dashboard/presentation/controller/custom_tf_tag_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/custom_tf_tag_controller.dart
index 2fdaf583b..455a2db9b 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/custom_tf_tag_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/custom_tf_tag_controller.dart
@@ -48,4 +48,10 @@ class CustomController extends TextfieldTagsController {
     }
     super.onChanged(value);
   }
+
+  @override
+  void onSubmitted(String value) {
+    super.onSubmitted(value);
+    actionAddTag?.call(value);
+  }
 }
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart
index 34c968e87..40b62b46f 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart
@@ -277,9 +277,11 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
               onAddTag: (value) {
                 if (advancedSearchFilterField == AdvancedSearchFilterField.form) {
                   controller.searchEmailFilter.from.add(value.trim());
+                  controller.lastTextForm.value = '';
                 }
                 if (advancedSearchFilterField == AdvancedSearchFilterField.to) {
                   controller.searchEmailFilter.to.add(value.trim());
+                  controller.lastTextTo.value = '';
                 }
               },
               onDeleteTag: (tag) {
@@ -311,9 +313,11 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
                 onAddTag: (value) {
                   if (advancedSearchFilterField == AdvancedSearchFilterField.form) {
                     controller.searchEmailFilter.from.add(value.trim());
+                    controller.lastTextForm.value = '';
                   }
                   if (advancedSearchFilterField == AdvancedSearchFilterField.to) {
                     controller.searchEmailFilter.to.add(value.trim());
+                    controller.lastTextTo.value = '';
                   }
                 },
                 onChange: (value) {