diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c99d59..6e690b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,4 +2,5 @@ Changes:
 * Render global 7tv emotes
 * Show tooltip with emote's name when hovering over it
 * Clickable urls(#47)
+* Add a space after completing names or emotes(#48)
 
diff --git a/hasherino/components/new_message_row.py b/hasherino/components/new_message_row.py
index bae09ae..6f4325f 100644
--- a/hasherino/components/new_message_row.py
+++ b/hasherino/components/new_message_row.py
@@ -98,7 +98,7 @@ async def emote_completion(self):
             )
 
             self.new_message.value = (
-                f"{self.new_message.value[:-len(last_word)]}{best_match_emote}"
+                f"{self.new_message.value[:-len(last_word)]}{best_match_emote} "
             )
             logging.debug(
                 f"Found emote completion for {last_word} -> {best_match_emote}."
@@ -125,7 +125,7 @@ async def user_completion(self):
             for user in sorted_user_list:
                 if user.lower().startswith(last_word.lower()):
                     self.new_message.value = (
-                        f"{self.new_message.value[:-len(last_word)]}{user}"
+                        f"{self.new_message.value[:-len(last_word)]}{user} "
                     )
                     logging.debug(
                         f"Found username completion for {last_word} -> {user}."