diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index bb0852d3d6..42b7971b87 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -450,6 +450,9 @@ 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;