diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart
index 4d2e6671..a2db3863 100644
--- a/lib/pages/views/homeserver_picker_view.dart
+++ b/lib/pages/views/homeserver_picker_view.dart
@@ -38,6 +38,7 @@ class HomeserverPickerView extends StatelessWidget {
             readOnly: !AppConfig.allowOtherHomeservers,
             onSubmit: (_) => controller.checkHomeserverAction(),
             unfocusOnClear: false,
+            autocorrect: false,
           ),
           elevation: 0,
         ),
diff --git a/lib/widgets/default_app_bar_search_field.dart b/lib/widgets/default_app_bar_search_field.dart
index 4ec1a7f9..9631da94 100644
--- a/lib/widgets/default_app_bar_search_field.dart
+++ b/lib/widgets/default_app_bar_search_field.dart
@@ -15,6 +15,7 @@ class DefaultAppBarSearchField extends StatefulWidget {
   final bool readOnly;
   final Widget prefixIcon;
   final bool unfocusOnClear;
+  final bool autocorrect;
 
   DefaultAppBarSearchField({
     Key key,
@@ -29,6 +30,7 @@ class DefaultAppBarSearchField extends StatefulWidget {
     this.readOnly = false,
     this.prefixIcon,
     this.unfocusOnClear = true,
+    this.autocorrect = true,
   }) : super(key: key);
 
   @override
@@ -77,7 +79,9 @@ class DefaultAppBarSearchFieldState extends State<DefaultAppBarSearchField> {
       padding: widget.padding ?? EdgeInsets.only(right: 12),
       child: TextField(
         autofocus: widget.autofocus,
-        autocorrect: false,
+        autocorrect: widget.autocorrect,
+        enableSuggestions: widget.autocorrect,
+        keyboardType: widget.autocorrect ? null : TextInputType.visiblePassword,
         controller: _searchController,
         onChanged: widget.onChanged,
         focusNode: _focusNode,