diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 0ebd05ae..706d6f57 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -20,6 +20,7 @@
   for `WebOrDesktopAttachmentPickerOption` in `StreamMessageInput`.
 - [[#1250]](https://github.com/GetStream/stream-chat-flutter/issues/1250) Fixed bottomRow widgetSpans getting resized
   twice when `textScaling` is enabled.
+- [[#1498]](https://github.com/GetStream/stream-chat-flutter/issues/1498) Fixed `MessageInput` autocomplete not working on non-mobile platforms.
 
 ✅ Added
 
diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index defb7257..7e051f96 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -28,7 +28,7 @@ dependencies:
   cupertino_icons: ^1.0.4
   flutter:
     sdk: flutter
-  responsive_builder: ^0.6.4
+  responsive_builder: ^0.7.0
   stream_chat_flutter: 
     path: ../
   stream_chat_localizations: 
diff --git a/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart b/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart
index ea9338d0..23ec5492 100644
--- a/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart
+++ b/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart
@@ -507,10 +507,12 @@ class _StreamAutocompleteState extends State<StreamAutocomplete> {
         final anchor = widget.optionsAlignment._toAnchor();
         final shouldShowOptions = _shouldShowOptions;
         final optionViewBuilder = shouldShowOptions
-            ? _currentTrigger!.optionsViewBuilder(
-                context,
-                _currentQuery!,
-                _messageEditingController,
+            ? TextFieldTapRegion(
+                child: _currentTrigger!.optionsViewBuilder(
+                  context,
+                  _currentQuery!,
+                  _messageEditingController,
+                ),
               )
             : null;