From 11cea616615989157e335d7ea2e323ce7fc978f8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 21 May 2018 12:28:08 +0100
Subject: [PATCH] refocus editor after clicking on autocompletes

---
 src/components/views/rooms/MessageComposerInput.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index eb4edfcfcb..6919a304c2 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1313,7 +1313,8 @@ export default class MessageComposerInput extends React.Component {
         if (range) {
             const change = editorState.change()
                                       .collapseToAnchor()
-                                      .moveOffsetsTo(range.start, range.end);
+                                      .moveOffsetsTo(range.start, range.end)
+                                      .focus();
             editorState = change.value;
         }
 
@@ -1321,12 +1322,14 @@ export default class MessageComposerInput extends React.Component {
         if (inline) {
             change = editorState.change()
                                 .insertInlineAtRange(editorState.selection, inline)
-                                .insertText(suffix);
+                                .insertText(suffix)
+                                .focus();
         }
         else {
             change = editorState.change()
                                 .insertTextAtRange(editorState.selection, completion)
-                                .insertText(suffix);
+                                .insertText(suffix)
+                                .focus();
         }
         editorState = change.value;