diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 2bb38217..f2fdda3f 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -658,6 +658,9 @@ class MessageInputState extends State<MessageInput> {
           if(_commandsOverlay == null) {
             _commandsOverlay = _buildCommandsOverlayEntry();
             Overlay.of(context).insert(_commandsOverlay);
+          } else {
+            _commandsOverlay?.remove();
+            _commandsOverlay = null;
           }
         },
       ),