diff --git a/extensions/emoji/js/src/forum/addComposerAutocomplete.js b/extensions/emoji/js/src/forum/addComposerAutocomplete.js
index 6bb8cc1e4..74545269e 100644
--- a/extensions/emoji/js/src/forum/addComposerAutocomplete.js
+++ b/extensions/emoji/js/src/forum/addComposerAutocomplete.js
@@ -26,10 +26,12 @@ export default function addComposerAutocomplete() {
     const applySuggestion = function(replacement) {
       const insert = replacement + ' ';
 
+      // When calling setValue(), emojiStart will be set back to 0 so we need to compute this beforehand
+      const index = emojiStart - 1 + insert.length;
+
       const content = composer.content();
       composer.editor.setValue(content.substring(0, emojiStart - 1) + insert + content.substr($textarea[0].selectionStart));
 
-      const index = emojiStart - 1 + insert.length;
       composer.editor.setSelectionRange(index, index);
 
       dropdown.hide();