diff --git a/src/Sidekick.Modules.Chat/Keybinds/ChatKeybindHandler.cs b/src/Sidekick.Modules.Chat/Keybinds/ChatKeybindHandler.cs
index 1c5004d8..d399c842 100644
--- a/src/Sidekick.Modules.Chat/Keybinds/ChatKeybindHandler.cs
+++ b/src/Sidekick.Modules.Chat/Keybinds/ChatKeybindHandler.cs
@@ -58,7 +58,12 @@ public override async Task Execute(string keybind)
                     return;
                 }
 
-                command = command.Replace(TokenLast, command.StartsWith("@") ? "@" + characterName : characterName);
+                if (command.StartsWith(TokenLast))
+                {
+                    command = command.Insert(0, "@");
+                }
+
+                command = command.Replace(TokenLast, characterName);
             }
 
             await clipboard.SetText(command);