diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
index a3ef2e3d784..308e54f4bc7 100644
--- a/addons/web_editor/static/src/js/editor/snippets.editor.js
+++ b/addons/web_editor/static/src/js/editor/snippets.editor.js
@@ -2068,19 +2068,18 @@ var SnippetsMenu = Widget.extend({
 
                         _.defer(async () => {
                             self.trigger_up('snippet_dropped', {$target: $snippetToInsert});
+
+                            await self._callForEachChildSnippet($snippetToInsert, function (editor) {
+                                return editor.buildSnippet();
+                            });
+
                             const jwEditor = self.wysiwyg.editor;
                             const vNodes = await self._insertSnippet($snippetToInsert);
-                            const layout = jwEditor.plugins.get(self.JWEditorLib.Layout);
-                            const domLayout = layout.engines.dom;
-                            const domNode = domLayout.getDomNodes(vNodes[0])[0];
+
                             self._disableUndroppableSnippets();
 
                             self.dragAndDropResolve();
 
-                            await self._callForEachChildSnippet($(domNode), function (editor) {
-                                return editor.buildSnippet();
-                            });
-
                             $snippetToInsert.trigger('content_changed');
                             await self._updateInvisibleDOM();
 
diff --git a/addons/website_form/static/src/snippets/s_website_form/options.js b/addons/website_form/static/src/snippets/s_website_form/options.js
index a00cfa92c1b..45a255dbb56 100644
--- a/addons/website_form/static/src/snippets/s_website_form/options.js
+++ b/addons/website_form/static/src/snippets/s_website_form/options.js
@@ -359,10 +359,7 @@ snippetOptions.registry.WebsiteFormEditor = FormEditor.extend({
         // If the form has no model it means a new snippet has been dropped.
         // Apply the default model selected in willStart on it.
         if (!this.$target[0].dataset.model_name) {
-            proms.push((async () => {
-                await this._applyFormModel();
-                await this.updateChangesInWysiwyg();
-            })());
+            proms.push(this._applyFormModel());
         }
 
         await Promise.all(proms);