diff --git a/lib/widgets/app.dart b/lib/widgets/app.dart
index d251b88b58..d5279b1885 100644
--- a/lib/widgets/app.dart
+++ b/lib/widgets/app.dart
@@ -114,9 +114,9 @@ class ZulipApp extends StatefulWidget {
 
     final localizations = ZulipLocalizations.of(navigatorKey.currentContext!);
     final newSnackBar = scaffoldMessenger!.showSnackBar(
-      snackBarAnimationStyle: AnimationStyle(
-        duration: const Duration(milliseconds: 200),
-        reverseDuration: const Duration(milliseconds: 50)),
+      snackBarAnimationStyle: const AnimationStyle(
+        duration: Duration(milliseconds: 200),
+        reverseDuration: Duration(milliseconds: 50)),
       SnackBar(
         content: Text(message),
         action: (details == null) ? null : SnackBarAction(
diff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart
index a31369c3d9..cfa2bd3885 100644
--- a/lib/widgets/autocomplete.dart
+++ b/lib/widgets/autocomplete.dart
@@ -38,6 +38,7 @@ abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT exten
 
 class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends State<AutocompleteField<QueryT, ResultT>> with PerAccountStoreAwareStateMixin<AutocompleteField<QueryT, ResultT>> {
   AutocompleteView<QueryT, ResultT>? _viewModel;
+  final ScrollController _scrollController = ScrollController();
 
   void _initViewModel(QueryT query) {
     _viewModel = widget.initViewModel(context, query)
@@ -63,6 +64,10 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
       } else {
         assert(_viewModel!.acceptsQuery(newQuery));
         _viewModel!.query = newQuery;
+        // Reset scroll when query content changes
+        if (_scrollController.hasClients) {
+          _scrollController.jumpTo(0);
+        }
       }
     }
   }
@@ -96,6 +101,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
   void dispose() {
     widget.controller.removeListener(_handleControllerChange);
     _viewModel?.dispose(); // removes our listener
+    _scrollController.dispose();
     super.dispose();
   }
 
@@ -138,6 +144,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
             child: ConstrainedBox(
               constraints: const BoxConstraints(maxHeight: 300), // TODO not hard-coded
               child: ListView.builder(
+                controller: _scrollController,
                 padding: EdgeInsets.zero,
                 shrinkWrap: true,
                 itemCount: _resultsToDisplay.length,