diff --git a/web_advanced_search/static/src/js/web_advanced_search.js b/web_advanced_search/static/src/js/web_advanced_search.js
index 2cb4f1ec2..694d44c6b 100644
--- a/web_advanced_search/static/src/js/web_advanced_search.js
+++ b/web_advanced_search/static/src/js/web_advanced_search.js
@@ -162,6 +162,10 @@ odoo.define("web_advanced_search", function(require) {
         tagName: "div",
         className: "x2x_container",
         attributes: {},
+        custom_events: _.extend({}, FieldManagerMixin.custom_events, {
+            load_optional_fields: "_onLoadOptionalFields",
+            save_optional_fields: "_onSaveOptionalFields",
+        }),
 
         /**
          * @override
@@ -314,6 +318,14 @@ odoo.define("web_advanced_search", function(require) {
             return this._field_widget.reset(this._get_record(), event);
         },
 
+        _onLoadOptionalFields: function(ev) {
+            ev.stopPropagation();
+        },
+
+        _onSaveOptionalFields: function(ev) {
+            ev.stopPropagation();
+        },
+
         /**
          * @override
          */