diff --git a/web/templates/message_reaction.hbs b/web/templates/message_reaction.hbs
index 2d0fcc2f9d..91e9b20878 100644
--- a/web/templates/message_reaction.hbs
+++ b/web/templates/message_reaction.hbs
@@ -1,6 +1,6 @@
 <div class="{{this.class}}" aria-label="{{this.label}}" data-reaction-id="{{this.local_id}}">
     {{#if this.emoji_alt_code}}
-        <div class="emoji_alt_code">&nbsp:{{this.emoji_name}}:</div>
+        <div class="emoji_alt_code">&nbsp;:{{this.emoji_name}}:</div>
     {{else if this.is_realm_emoji}}
         <img src="{{this.url}}" class="emoji" />
     {{else}}
diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs
index c6eb59c64e..886522a967 100644
--- a/web/templates/set_status_overlay.hbs
+++ b/web/templates/set_status_overlay.hbs
@@ -11,7 +11,7 @@
     {{#each default_status_messages_and_emoji_info}}
         <button type="button" class="button no-style user-status-value">
             {{#if emoji.emoji_alt_code}}
-                <div class="emoji_alt_code">&nbsp:{{emoji.emoji_name}}:</div>
+                <div class="emoji_alt_code">&nbsp;:{{emoji.emoji_name}}:</div>
             {{else if emoji.url}}
                 <img src="{{emoji.url}}" class="emoji status_emoji" />
             {{else}}
diff --git a/web/templates/status_emoji.hbs b/web/templates/status_emoji.hbs
index 9666c849ac..6cb41c8082 100644
--- a/web/templates/status_emoji.hbs
+++ b/web/templates/status_emoji.hbs
@@ -1,5 +1,5 @@
 {{#if emoji_alt_code}}
-<span class="emoji_alt_code">&nbsp:{{emoji_name}}:</span>
+<span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span>
 {{else if still_url}}
 <img src="{{still_url}}" class="emoji status_emoji" data-animated-url="{{url}}" data-still-url="{{still_url}}" />
 {{else if url}}
diff --git a/web/templates/status_emoji_selector.hbs b/web/templates/status_emoji_selector.hbs
index 76fa2abc2d..4d67a6e3ab 100644
--- a/web/templates/status_emoji_selector.hbs
+++ b/web/templates/status_emoji_selector.hbs
@@ -1,6 +1,6 @@
 {{#if selected_emoji}}
     {{#if selected_emoji.emoji_alt_code}}
-        <div class="emoji_alt_code">&nbsp:{{selected_emoji.emoji_name}}:</div>
+        <div class="emoji_alt_code">&nbsp;:{{selected_emoji.emoji_name}}:</div>
     {{else if selected_emoji.url}}
         <img src="{{selected_emoji.url}}" class="emoji selected_emoji" />
     {{else}}
diff --git a/web/templates/user_info_popover_content.hbs b/web/templates/user_info_popover_content.hbs
index 7336f8991e..d6e117694e 100644
--- a/web/templates/user_info_popover_content.hbs
+++ b/web/templates/user_info_popover_content.hbs
@@ -66,7 +66,7 @@
             <span id="status_message">
                 {{#if status_emoji_info}}
                     {{#if status_emoji_info.emoji_alt_code}}
-                        <div class="emoji_alt_code">&nbsp:{{status_emoji_info.emoji_name}}:</div>
+                        <div class="emoji_alt_code">&nbsp;:{{status_emoji_info.emoji_name}}:</div>
                     {{else if status_emoji_info.url}}
                         <img src="{{status_emoji_info.url}}" class="emoji status_emoji" />
                     {{else}}