diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index 118f23f49997e22d90db2706cb765359fa1475d2..2bc9e5042079645d80e669c50deb62ea0aa2033a 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -226,7 +226,7 @@ public class MainWindowController implements Initializable {
      * @param cmd The line to parse.
      */
     private void parseChatCommand(String cmd){
-        String[] command = cmd.split(" ");
+        String[] command = cmd.split(" ", 2);
         if (AppConfig.CHAT_COMMANDS.contains(command[0])){
             if (command[0].equals("help")) {
                 drawCommands();
@@ -290,7 +290,6 @@ public class MainWindowController implements Initializable {
                     // Now iterating over connections
                     Connection c = new Connection.ConnectionBuilder(connections.getJSONObject(i)).build();
                     drawConnection(c, 30, 100 + 100 * i);
-
                 }
             } catch (IOException | ParseException e) {
                 showSadMessage(AppConfig.ERROR_API_UNREACHABLE);