diff --git a/pitiupi.testSocket/out/GUI/ChatMenu.class b/pitiupi.testSocket/out/GUI/ChatMenu.class
index 65067fe..77a7f11 100644
Binary files a/pitiupi.testSocket/out/GUI/ChatMenu.class and b/pitiupi.testSocket/out/GUI/ChatMenu.class differ
diff --git a/pitiupi.testSocket/out/control/ChatController.class b/pitiupi.testSocket/out/control/ChatController.class
index ca920e4..b7ce85e 100644
Binary files a/pitiupi.testSocket/out/control/ChatController.class and b/pitiupi.testSocket/out/control/ChatController.class differ
diff --git a/pitiupi.testSocket/out/plugin/TestChat.class b/pitiupi.testSocket/out/plugin/TestChat.class
index 6cbbaca..9c672dd 100644
Binary files a/pitiupi.testSocket/out/plugin/TestChat.class and b/pitiupi.testSocket/out/plugin/TestChat.class differ
diff --git a/pitiupi.testSocket/src/control/ChatController.java b/pitiupi.testSocket/src/control/ChatController.java
index 96a3361..2363df2 100644
--- a/pitiupi.testSocket/src/control/ChatController.java
+++ b/pitiupi.testSocket/src/control/ChatController.java
@@ -20,7 +20,6 @@ public class ChatController {
     private final HashMap<TcpConnection, JMenuItem> chatMenus;
     private final HashMap<TcpConnection, ChatWindow>  chatWindows;
 
-
     public ChatController(MainWindow mainWindow, ChatMenu chatMenu) {
         this.mainWindow = mainWindow;
         publicChatWindow = new PublicChatWindow(mainWindow);
@@ -28,7 +27,9 @@ public class ChatController {
         chatMenus = new HashMap<>();
         chatWindows = new HashMap<>();
 
-        chatMenu.newMenuItem(new JMenuItem("Show global chat"), publicChatWindow);
+        this.chatMenu = chatMenu;
+
+        this.chatMenu.newMenuItem(new JMenuItem("Show global chat"), publicChatWindow);
     }
 
     public void addChatWindow(TcpConnection tcpConnection) {
@@ -36,10 +37,8 @@ public class ChatController {
 
         PrivateChatWindow newChat = new PrivateChatWindow(mainWindow, tcpConnection);
         chatWindows.put(tcpConnection, newChat);
-
         JMenuItem newMenuItem = new JMenuItem();
         chatMenus.put(tcpConnection, newMenuItem);
-
         newMenuItem.setText(tcpConnection.getAddress().toString());
         chatMenu.newMenuItem(newMenuItem, newChat);
     }
diff --git a/pitiupi.testSocket/src/plugin/TestChat.java b/pitiupi.testSocket/src/plugin/TestChat.java
index de25242..72076d1 100644
--- a/pitiupi.testSocket/src/plugin/TestChat.java
+++ b/pitiupi.testSocket/src/plugin/TestChat.java
@@ -8,6 +8,7 @@ import pitiupi.net.Message;
 import pitiupi.net.tcp.TcpConnection;
 import pitiupi.plugin.PrivateConnectionPlugin;
 
+import javax.swing.*;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -57,9 +58,12 @@ public class TestChat implements PrivateConnectionPlugin{
         chatController.receivePublic(testChatMessage);
     }
 
+
     @Override
     public void receivePrivateConnection(TcpConnection tcpConnection) {
-        chatController.addChatWindow(tcpConnection);
+        SwingUtilities.invokeLater(() -> {
+            chatController.addChatWindow(tcpConnection);
+        });
     }
 
     @Override