diff --git a/src/main/java/ChatClient.java b/src/main/java/ChatClient.java
index b19c6a0..6a3e773 100644
--- a/src/main/java/ChatClient.java
+++ b/src/main/java/ChatClient.java
@@ -142,7 +142,12 @@ public class ChatClient extends JFrame implements KeyListener {
     }
     
     private void showEmojiPicker() {
-      
+      JDialog emojiDialog = new JDialog(this, "Emoji Picker", true);
+      emojiDialog.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+      emojiDialog.getContentPane().add(emojiPicker);
+      emojiDialog.pack();
+      emojiDialog.setLocationRelativeTo(this);
+      emojiDialog.setVisible(true);
       
     }