1 files changed, 6 insertions, 2 deletions
diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index 95a09f7820f..6c9965a57d1 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -217,7 +217,9 @@ class Composer extends Component {
      */
     _onClickAddAttachment() {
         this._fileUploaderRef.comp.openBrowserFileUploader();
-        this.focus();
+        if (!this.env.device.isMobile) {
+            this.focus();
+        }
     }
 
     /**
@@ -302,7 +304,9 @@ class Composer extends Component {
         ev.stopPropagation();
         this._textInputRef.comp.saveStateInStore();
         this.composer.insertIntoTextInput(ev.detail.unicode);
-        this.focus();
+        if (!this.env.device.isMobile) {
+            this.focus();
+        }
     }
 
     /**