diff --git a/src/main/java/ChatClient.java b/src/main/java/ChatClient.java
index bbfc218..46bdc1a 100644
--- a/src/main/java/ChatClient.java
+++ b/src/main/java/ChatClient.java
@@ -126,6 +126,11 @@ public class ChatClient extends JFrame implements KeyListener {
         inputPanel.add(inputTextField, BorderLayout.CENTER);
         emojiPicker = new EmojiPicker(inputTextField);
         
+        JPanel emojiPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        emojiButton = new JButton("😀"); 
+        emojiButton.setPreferredSize(new Dimension(50, 50));
+
+        inputPanel.add(emojiPanel, BorderLayout.LINE_END);
         
         add(outputScrollPane, BorderLayout.CENTER);
         add(inputTextField, BorderLayout.PAGE_END);