diff --git a/src/main/java/net/minestom/server/listener/ChatMessageListener.java b/src/main/java/net/minestom/server/listener/ChatMessageListener.java
index 8572b9468..96253dab0 100644
--- a/src/main/java/net/minestom/server/listener/ChatMessageListener.java
+++ b/src/main/java/net/minestom/server/listener/ChatMessageListener.java
@@ -72,15 +72,15 @@ public class ChatMessageListener {
         final UUID uuid = chatEvent.getPlayer().getUuid();
 
         return Component.translatable("chat.type.text")
-                   .args(Component.text(username)
-                             .insertion(username)
-                             .clickEvent(ClickEvent.suggestCommand("/msg" + username))
-                             .hoverEvent(HoverEvent.showEntity(HoverEvent.ShowEntity.of(
-                                 Key.key("minecraft", "player"),
-                                 uuid,
-                                 Component.text(username)
-                             ))),
-                         Component.text(chatEvent.getMessage())
+                .args(Component.text(username)
+                                .insertion(username)
+                                .clickEvent(ClickEvent.suggestCommand("/msg " + username + " "))
+                                .hoverEvent(HoverEvent.showEntity(HoverEvent.ShowEntity.of(
+                                        Key.key("minecraft", "player"),
+                                        uuid,
+                                        Component.text(username)
+                                ))),
+                        Component.text(chatEvent.getMessage())
                 );
     }