diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 5ea11dc63c4..94bb408b9ac 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -70,6 +70,22 @@ options.registry.company_data = options.Class.extend({
             });
         }
     },
+
+    on_focus: function () {
+        this._super.apply(this, arguments);
+
+        var proto = options.registry.company_data.prototype;
+
+        Dialog.confirm(null, _t("Do you want to edit the company data ?"), {
+            confirm_callback: function () {
+                editor.editor_bar.save_without_reload().then(function () {
+                    proto.__link_deferred.then(function (link) {
+                        window.location.href = link;
+                    });
+                });
+            },
+        });
+    },
 });
 
 options.registry.slider = options.Class.extend({
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index a1cbb1b4578..cff4d7ed4a8 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -874,7 +874,7 @@
          data-no-check="true"/>
 
     <div data-js="company_data"
-         data-selector="img[src='/logo.png'], [data-oe-expression='res_company.partner_id']"
+         data-selector="[data-oe-expression='res_company.partner_id']"
          data-no-check="true"/>
 </template>
 </odoo>