diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 42b7971b87..ee3e8f1390 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -450,9 +450,6 @@ export default class ContentMessages {
             },
         };
 
-        // Focus the composer view
-        dis.dispatch({action: 'focus_composer'})
-
         // if we have a mime type for the file, add it to the message metadata
         if (file.type) {
             content.info.mimetype = file.type;
@@ -495,6 +492,9 @@ export default class ContentMessages {
         this.inprogress.push(upload);
         dis.dispatch({action: 'upload_started'});
 
+        // Focus the composer view
+        dis.dispatch({action: 'focus_composer'});
+
         let error;
 
         function onProgress(ev) {