diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index bb0852d3d6..ee3e8f1390 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -492,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) {