diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 574144e95b..37a50ee8d8 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -26,7 +26,7 @@ export default class EmojiProvider extends AutocompleteProvider {
                     completion: shortnameToUnicode(shortname),
                     component: (
                         <div className="mx_Autocomplete_Completion">
-                            <span dangerouslySetInnerHTML={{__html: imageHTML}}></span> {shortname}
+                            <span style={{maxWidth: '1em'}} dangerouslySetInnerHTML={{__html: imageHTML}}></span>&nbsp;&nbsp;{shortname}
                         </div>
                     ),
                     range,