From 085f2d199de8468ae363428872d0a34101f695f0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 15 May 2019 17:17:35 +0100
Subject: [PATCH] focus editor after clicking edit

---
 src/components/views/elements/MessageEditor.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js
index 20d6dc6f66..b42923954b 100644
--- a/src/components/views/elements/MessageEditor.js
+++ b/src/components/views/elements/MessageEditor.js
@@ -144,6 +144,13 @@ export default class MessageEditor extends React.Component {
 
     componentDidMount() {
         this._updateEditorState();
+        const sel = document.getSelection();
+        const range = document.createRange();
+        range.selectNodeContents(this._editorRef);
+        range.collapse(false);
+        sel.removeAllRanges();
+        sel.addRange(range);
+        this._editorRef.focus();
     }
 
     render() {