diff --git a/src/skins/vector/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js
index 2f0e7ac57f..51f3a1150e 100644
--- a/src/skins/vector/views/molecules/MessageComposer.js
+++ b/src/skins/vector/views/molecules/MessageComposer.js
@@ -28,6 +28,10 @@ module.exports = React.createClass({
     displayName: 'MessageComposer',
     mixins: [MessageComposerController],
 
+    onInputClick: function(ev) {
+        this.refs.textarea.focus();
+    },
+
     onUploadClick: function(ev) {
         this.refs.uploadInput.click();
     },
@@ -60,7 +64,7 @@ module.exports = React.createClass({
                         <div className="mx_MessageComposer_avatar">
                             <MemberAvatar member={me} width={24} height={24} />
                         </div>
-                        <div className="mx_MessageComposer_input">
+                        <div className="mx_MessageComposer_input" onClick={ this.onInputClick }>
                             <textarea ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder="Type a message..." />
                         </div>
                         <div className="mx_MessageComposer_upload" onClick={this.onUploadClick}>