diff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart
index a1e5289b01..29c6cc03e4 100644
--- a/lib/widgets/autocomplete.dart
+++ b/lib/widgets/autocomplete.dart
@@ -33,6 +33,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)
@@ -57,7 +58,13 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
         _initViewModel(newQuery);
       } else {
         assert(_viewModel!.acceptsQuery(newQuery));
+        final oldQuery = _viewModel!.query;
         _viewModel!.query = newQuery;
+        // Reset scroll when query content changes
+        if (oldQuery.toString() != newQuery.toString() &&
+            _scrollController.hasClients) {
+          _scrollController.jumpTo(0);
+        }
       }
     }
   }
@@ -91,6 +98,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
   void dispose() {
     widget.controller.removeListener(_handleControllerChange);
     _viewModel?.dispose(); // removes our listener
+    _scrollController.dispose();
     super.dispose();
   }
 
@@ -133,6 +141,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,