diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index b614fbb9..191da65f 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -521,6 +521,7 @@ class MessageInputState extends State<MessageInput> {
   void _setCommand(Command c) {
     setState(() {
       chosenCommand = c;
+      _commandEnabled = true;
     });
     _commandsOverlay?.remove();
     _commandsOverlay = null;
@@ -940,7 +941,7 @@ class MessageInputState extends State<MessageInput> {
     }
 
     if(_commandEnabled) {
-      text = '/${chosenCommand.args} ' + text;
+      text = '/${chosenCommand.name} ' + text;
     }
 
     final attachments = List<_SendingAttachment>.from(_attachments);