diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 94bb408b9ac..5ea11dc63c4 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -70,22 +70,6 @@ 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/website_templates.xml b/addons/website/views/website_templates.xml
index 3437f14deeb..f86887f1475 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -215,7 +215,7 @@
 <template id="layout_logo_show" inherit_id="website.layout" customize_show="True" name="Show Logo">
     <xpath expr="//header//a[@class='navbar-brand']" position="replace">
         <a href="/" class="navbar-brand logo">
-            <img src="/logo.png" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name"/>
+            <span t-field="res_company.logo" t-options="{'widget': 'image'}" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name" />
         </a>
     </xpath>
 </template>