diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8f8122c4438..652ad74c012 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1621,12 +1621,11 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
     },
     start: function() {
         this._super.apply(this, arguments);
-        var $button = this.$element.find('button');
-        $button.click(this.on_click);
+        this.$element.click(this.on_click);
         if (this.node.attrs.help || instance.connection.debug) {
             this.do_attach_tooltip();
         }
-        this.setupFocus($button);
+        this.setupFocus(this.$element);
     },
     on_click: function() {
         var self = this;