diff --git a/__manifest__.py b/__manifest__.py
index 08b1b8c344a..49e6ffcbe4d 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -11,7 +11,7 @@ Odoo Form Editor
 
 Allows you to build web forms on the website using the website builder.
         """,
-    'depends': ['website_form'],
+    'depends': ['website_enterprise', 'website_form'],
     'data': [
         'data/mail_mail_data.xml',
         'views/website_form_editor_templates.xml',
diff --git a/static/src/img/s_website_form.png b/static/src/img/s_website_form.png
deleted file mode 100644
index 3df58edabd1..00000000000
Binary files a/static/src/img/s_website_form.png and /dev/null differ
diff --git a/views/snippets.xml b/views/snippets.xml
index e07ff2c69a4..cfc9f6d5827 100644
--- a/views/snippets.xml
+++ b/views/snippets.xml
@@ -12,9 +12,13 @@
             </form>
         </template>
 
+        <template id="remove_external_snippets" inherit_id="website_enterprise.external_snippets">
+            <xpath expr="//t[@t-install='website_form_editor']" position="replace"/>
+        </template>
+
         <template id="register_s_website_form" inherit_id="website.snippets" name="Snippet Form Builder">
-            <xpath expr="//div[@id='snippet_feature']/div[contains(@class, 'o_panel_body')]" position="inside">
-                <t t-snippet="website_form_editor.s_website_form" t-thumbnail="/website_form_editor/static/src/img/s_website_form.png"/>
+            <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
+                <t t-snippet="website_form_editor.s_website_form" t-thumbnail="/website_enterprise/static/src/img/s_website_form.png"/>
             </xpath>
         </template>