2 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/static/src/js/widgets/attach_document.js b/addons/web/static/src/js/widgets/attach_document.js
index 041b021d60b..13496f3aea7 100644
--- a/addons/web/static/src/js/widgets/attach_document.js
+++ b/addons/web/static/src/js/widgets/attach_document.js
@@ -11,7 +11,7 @@ var _t = core._t;
 var AttachDocument = Widget.extend({
     template: 'AttachDocument',
     events: {
-        'click span.o_attach_document': '_onClickAttachDocument',
+        'click': '_onClickAttachDocument',
         'change input.o_input_file': '_onFileChanged',
     },
     /**
@@ -76,6 +76,9 @@ var AttachDocument = Widget.extend({
      * @param {Event} ev
      */
     _onClickAttachDocument: function (ev) {
+        if ($(ev.target).is('input.o_input_file')) {
+            return;
+        }
         var fieldNames = this.getParent().canBeSaved(this.state.id);
         if (fieldNames.length) {
             return this._notifyInvalidFields(fieldNames);
diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js
index c9498950a04..cc0f8825643 100644
--- a/addons/web/static/src/js/widgets/switch_company_menu.js
+++ b/addons/web/static/src/js/widgets/switch_company_menu.js
@@ -53,7 +53,7 @@ var SwitchCompanyMenu = Widget.extend({
             } else {
                 a = '<span style="margin-right: 24px;"/>';
             }
-            companiesList += '<a href="#" class="dropdown-item" data-menu="company" data-company-id="' +
+            companiesList += '<a role="menuitem" href="#" class="dropdown-item" data-menu="company" data-company-id="' +
                             company[0] + '">' + a + company[1] + '</a>';
         });
         this.$('.dropdown-menu').html(companiesList);