diff --git a/emoji-translate.js b/emoji-translate.js
index 93375a94..e30be7b6 100644
--- a/emoji-translate.js
+++ b/emoji-translate.js
@@ -54,8 +54,11 @@ function translateWord(word) {
     node.innerHTML = word;
   }
 
-  // Reapply the punctuation.
-  node.innerHTML = firstSymbol + node.innerHTML + lastSymbol + ' ';
+  // Reapply the punctuation but only add a bonus space for non-emoji.
+  node.innerHTML = firstSymbol + node.innerHTML + lastSymbol;
+  if (emoji == '')
+    node.innerHTML += ' ';
+
   return node;
 }
 
diff --git a/extension/emoji-translate.js b/extension/emoji-translate.js
index a937be53..b7c916fa 100644
--- a/extension/emoji-translate.js
+++ b/extension/emoji-translate.js
@@ -73,8 +73,10 @@ function translateWord(word) {
     node.innerHTML = word;
   }
 
-  // Reapply the punctuation.
-  node.innerHTML = firstSymbol + node.innerHTML + lastSymbol + ' ';
+  // Reapply the punctuation but only add a bonus space for non-emoji.
+  node.innerHTML = firstSymbol + node.innerHTML + lastSymbol;
+  if (emoji == '')
+    node.innerHTML += ' ';
   return node;
 }