diff --git a/auth/lib/store/code_display_store.dart b/auth/lib/store/code_display_store.dart
index 74972f5a22..d6afd1b494 100644
--- a/auth/lib/store/code_display_store.dart
+++ b/auth/lib/store/code_display_store.dart
@@ -32,7 +32,7 @@ class CodeDisplayStore {
       if (code.hasError) continue;
       tags.addAll(code.display.tags);
     }
-    return tags.toList();
+    return tags.toList()..sort();
   }
 
   Future<void> showDeleteTagDialog(BuildContext context, String tag) async {
diff --git a/auth/lib/ui/home_page.dart b/auth/lib/ui/home_page.dart
index 4110a5f88e..81fd7ed586 100644
--- a/auth/lib/ui/home_page.dart
+++ b/auth/lib/ui/home_page.dart
@@ -238,6 +238,8 @@ class _HomePageState extends State<HomePage> {
           title: !_showSearchBox
               ? const Text('Ente Auth')
               : TextField(
+                  autocorrect: false,
+                  enableSuggestions: false,
                   focusNode: searchInputFocusNode,
                   autofocus: _searchText.isEmpty,
                   controller: _textController,