diff --git a/src/pages/customerservice/support/conversation/components/ChatInput/ChatInput.jsx b/src/pages/customerservice/support/conversation/components/ChatInput/ChatInput.jsx
index 1bb1bf9..079c561 100644
--- a/src/pages/customerservice/support/conversation/components/ChatInput/ChatInput.jsx
+++ b/src/pages/customerservice/support/conversation/components/ChatInput/ChatInput.jsx
@@ -425,9 +425,18 @@ const  str_substr = (start, end, str)=> {
       range = window.getSelection().getRangeAt(0) 
     }
     if (range && innerRef.current) {
+      var wrapped_obj = document.createElement('span')
       var obj = document.createElement('span')
-      obj.innerHTML=emoji 
-      range.insertNode(obj)
+      var obj2 = document.createElement('span')
+      obj.setAttribute('emoji','emoji')
+      obj.setAttribute('contentEditable',false)
+      obj.style.fontSize="20px"
+      obj.innerHTML=emoji
+
+      wrapped_obj.appendChild(obj)
+      wrapped_obj.appendChild(obj2)
+
+      range.insertNode(wrapped_obj)
       setCachedRange(range)
       range.collapse(false)
       window.getSelection().removeAllRanges();
diff --git a/src/pages/customerservice/support/conversation/components/ChatInput/style.module.css b/src/pages/customerservice/support/conversation/components/ChatInput/style.module.css
index 2d3e84c..25a014a 100644
--- a/src/pages/customerservice/support/conversation/components/ChatInput/style.module.css
+++ b/src/pages/customerservice/support/conversation/components/ChatInput/style.module.css
@@ -16,6 +16,7 @@
   padding: 10px;
   margin-right: 10px;
   font-size: 13px;
+  line-height: 13px;
   font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
   letter-spacing: 2px;
 }
diff --git a/src/pages/customerservice/support/conversation/components/EmojiPopover/style.module.css b/src/pages/customerservice/support/conversation/components/EmojiPopover/style.module.css
index 301bb93..15299cc 100644
--- a/src/pages/customerservice/support/conversation/components/EmojiPopover/style.module.css
+++ b/src/pages/customerservice/support/conversation/components/EmojiPopover/style.module.css
@@ -7,7 +7,7 @@
   left: 30px;
   display: flex;
   flex-wrap: wrap;
-  width: 288px;
+  width: 400px;
   background-color: white;
   border: solid 1px #aaaaaa;
   border-radius: 5px;
@@ -30,6 +30,7 @@
   left: -14.5px;
 }
 .customer_service_content .emoji_item {
+  font-size: 20px;
   box-sizing: border-box;
   padding: 0px 7px 0px 3px;
 }