diff --git a/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx b/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx
index 52ba80ec9..9bf1f9346 100644
--- a/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx
+++ b/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx
@@ -171,8 +171,9 @@ class EmojisComposerExtension extends ContenteditableExtension {
         maxLength = emojiOption.length;
       }
     }
+    // TODO: Calculate width of words more accurately for a closer fit.
     const WIDTH_PER_CHAR = 8;
-    return (maxLength + 8) * WIDTH_PER_CHAR;
+    return (maxLength + 10) * WIDTH_PER_CHAR;
   }
 
   static _emojiPickerHeight(emojiOptions) {