diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 13530e8b..a7215670 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -2,6 +2,7 @@
   <div
     v-click-outside="onClickOutside"
     class="emoji-input"
+    :class="{ 'with-picker': !hideEmojiButton }"
   >
     <slot />
     <template v-if="enableEmojiPicker">
@@ -63,6 +64,10 @@
   flex-direction: column;
   position: relative;
 
+  &.with-picker input {
+    padding-right: 30px;
+  }
+
   .emoji-picker-icon {
     position: absolute;
     top: 0;