diff --git a/view/adminhtml/ui_component/pagebuilder_widget_form.xml b/view/adminhtml/ui_component/pagebuilder_widget_form.xml
old mode 100755
new mode 100644
index 5bb72b9..d8447ba
--- a/view/adminhtml/ui_component/pagebuilder_widget_form.xml
+++ b/view/adminhtml/ui_component/pagebuilder_widget_form.xml
@@ -15,7 +15,7 @@
     <dataSource name="pagebuilder_widget_form_data_source">
         <argument name="data" xsi:type="array">
             <item name="js_config" xsi:type="array">
-                <item name="component" xsi:type="string">Magento_PageBuilder/js/form/provider</item>
+                <item name="component" xsi:type="string">MageOS_PageBuilderWidget/js/form/provider</item>
             </item>
         </argument>
         <dataProvider name="pagebuilder_widget_form_data_source" class="Magento\PageBuilder\Model\ContentType\DataProvider">
diff --git a/view/adminhtml/web/js/form/element/widget-builder.js b/view/adminhtml/web/js/form/element/widget-builder.js
index 5c64c9e..ce2e20f 100644
--- a/view/adminhtml/web/js/form/element/widget-builder.js
+++ b/view/adminhtml/web/js/form/element/widget-builder.js
@@ -57,13 +57,28 @@ define([
         },
 
         updateValue: function () {
-            this.submitWidgetForm($('#widgetForm' + this.uid));
+            this.prepareForSave().fail(function () {});
+        },
+
+        prepareForSave: function () {
+            let $form = $('#widgetForm' + this.uid);
+
+            if (!this.saveIsAvailable() || !$form.length || this.widgetHtmlForm() === null) {
+                return $.Deferred().resolve().promise();
+            }
+
+            return this.submitWidgetForm($form);
         },
 
         submitWidgetForm: function ($form) {
-            let validationResult,
+            let deferred = $.Deferred(),
+                validationResult,
                 self = this;
 
+            if (!$form.length) {
+                return deferred.resolve().promise();
+            }
+
             $.data($form[0], 'validator', null);
 
             $form.validate({
@@ -78,59 +93,89 @@ define([
 
             validationResult = $form.valid();
 
-            if (validationResult) {
+            if (!validationResult) {
+                return deferred.reject().promise();
+            }
+
+            let formElements = [],
+                i = 0;
+            Form.getElements($form[0]).each(function (e) {
+
+                if (jQuery(e).closest('.skip-submit, .no-display').length === 0) {
+                    formElements[i] = e;
+                    i++;
+                }
+            });
+
+            let params = this.serializeElements(formElements);
+            let widgetData = this.getWidgetData();
+            params["form_key"] = window.FORM_KEY;
+            params["widget_type"] = widgetData.type;
+            this.widgetData(params);
+
+            let requestData = {
+                method: 'POST',
+                data: params
+            };
+            if (_.isEmpty(params["widget_type"])) {
+                return deferred.resolve().promise();
+            }
+            $('body').trigger('processStart');
+            $.ajax(objectUtils.nested(Config.getConfig(), this.saveFormUrlConfigPath), requestData)
+                .always(function () {
+                    $('body').trigger('processStop');
+                }.bind(this))
+                .done(function (response) {
+                    let contentSettings,
+                        regex,
+                        match,
+                        result;
+
+                    if (
+                        !response ||
+                        _.isUndefined(response.widgetDeclaration) ||
+                        response.widgetDeclaration === null ||
+                        _.isUndefined(response.widgetData) ||
+                        response.widgetData === null
+                    ) {
+                        self.errorMessage(this.messages.UNKOWN_ERROR);
+                        deferred.reject();
 
-                let formElements = [],
-                    i = 0;
-                Form.getElements($form[0]).each(function (e) {
+                        return;
+                    }
+
+                    self.errorMessage(null);
+                    regex = /(\w+)="([^"]*)"/g;
+                    result = {widget_type: widgetData.type, values: {}};
 
-                    if (jQuery(e).closest('.skip-submit, .no-display').length === 0) {
-                        formElements[i] = e;
-                        i++;
+                    while ((match = regex.exec(response.widgetData)) !== null) {
+                        result.values[match[1]] = match[2];
                     }
-                });
 
-                let params = this.serializeElements(formElements);
-                let widgetData = this.getWidgetData();
-                params["form_key"] = window.FORM_KEY;
-                params["widget_type"] = widgetData.type;
-                this.widgetData(params);
+                    contentSettings = registry.get(this.parentName + '.content_settings');
+                    if (!contentSettings) {
+                        self.errorMessage(this.messages.UNKOWN_ERROR);
+                        deferred.reject();
 
-                let requestData = {
-                    method: 'POST',
-                    data: params
-                }
-                if (!_.isEmpty(params["widget_type"])) {
-                    $('body').trigger('processStart');
-                    $.ajax(objectUtils.nested(Config.getConfig(), this.saveFormUrlConfigPath), requestData)
-                        .always(function () {
-                            $('body').trigger('processStop');
-                            self.errorMessage(null);
-                        }.bind(this))
-                        .done(function (response) {
-
-                            let regex = /(\w+)="([^"]*)"/g,
-                                match,
-                                result = {widget_type: widgetData.type, values: {}};
-
-                            while ((match = regex.exec(response.widgetData)) !== null) {
-                                result.values[match[1]] = match[2];
-                            }
+                        return;
+                    }
 
-                            registry.get(this.parentName + '.content_settings').value(JSON.stringify({
-                                "data": JSON.stringify(result),
-                                "preview": response.widgetPreview,
-                                "code": self.selectedWidgetCode()
-                            }));
+                    contentSettings.value(JSON.stringify({
+                        "data": JSON.stringify(result),
+                        "preview": response.widgetPreview,
+                        "code": self.selectedWidgetCode()
+                    }));
 
-                            self.value(response.widgetDeclaration);
+                    self.value(response.widgetDeclaration);
+                    deferred.resolve(response);
 
-                        }.bind(this))
-                        .fail(function () {
-                            self.errorMessage(this.messages.UNKOWN_ERROR);
-                        }.bind(this));
-                }
-            }
+                }.bind(this))
+                .fail(function () {
+                    self.errorMessage(this.messages.UNKOWN_ERROR);
+                    deferred.reject();
+                }.bind(this));
+
+            return deferred.promise();
         },
 
         getWidgetData: function () {
diff --git a/view/adminhtml/web/js/form/provider.js b/view/adminhtml/web/js/form/provider.js
new file mode 100644
index 0000000..1676661
--- /dev/null
+++ b/view/adminhtml/web/js/form/provider.js
@@ -0,0 +1,37 @@
+define([
+    'jquery',
+    'underscore',
+    'Magento_PageBuilder/js/form/provider',
+    'uiRegistry'
+], function ($, _, Provider, registry) {
+    'use strict';
+
+    return Provider.extend({
+        save: function (options) {
+            let save = this._super.bind(this, options),
+                widgetBuilders = this.getWidgetBuilders();
+
+            if (_.isEmpty(widgetBuilders)) {
+                save();
+
+                return this;
+            }
+
+            $.when.apply($, widgetBuilders.map(function (widgetBuilder) {
+                return widgetBuilder.prepareForSave();
+            })).done(function () {
+                save();
+            });
+
+            return this;
+        },
+
+        getWidgetBuilders: function () {
+            return registry.filter(function (component) {
+                return component &&
+                    component.ns === this.ns &&
+                    typeof component.prepareForSave === 'function';
+            }.bind(this));
+        }
+    });
+});