diff --git a/templates/chat/chat_js.html b/templates/chat/chat_js.html
index 9d84526..70c52a0 100644
--- a/templates/chat/chat_js.html
+++ b/templates/chat/chat_js.html
@@ -478,12 +478,13 @@
 
     const button = document.querySelector('#emoji-button');
     const tooltip = document.querySelector('.tooltip');
-    Popper.createPopper(button, tooltip, {
-      placement: isMobile ? 'auto-end' : 'left-end',
+    const popper = Popper.createPopper(button, tooltip, {
+      placement: isMobile ? 'auto-end' : 'left',
     });
 
     function toggleEmoji() {
-      tooltip.classList.toggle('shown')
+      tooltip.classList.toggle('shown');
+      popper.update();
     }
     $('#emoji-button').on('click', function(e) {
       e.preventDefault();