diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart
index 5cd2af2be..bd2a01296 100644
--- a/flutter/lib/common/widgets/address_book.dart
+++ b/flutter/lib/common/widgets/address_book.dart
@@ -386,7 +386,7 @@ class _AddressBookState extends State<AddressBook> {
                       errorText: msg.isEmpty ? null : translate(msg),
                     ),
                     controller: controller,
-                    focusNode: FocusNode()..requestFocus(),
+                    autofocus: true,
                   ),
                 ),
               ],
diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart
index 837a197dc..e96a2b406 100644
--- a/flutter/lib/common/widgets/dialog.dart
+++ b/flutter/lib/common/widgets/dialog.dart
@@ -54,7 +54,7 @@ void changeIdDialog() {
             ],
             maxLength: 16,
             controller: controller,
-            focusNode: FocusNode()..requestFocus(),
+            autofocus: true,
           ),
           const SizedBox(
             height: 4.0,
@@ -99,7 +99,7 @@ void changeWhiteList({Function()? callback}) async {
                       errorText: msg.isEmpty ? null : translate(msg),
                     ),
                     controller: controller,
-                    focusNode: FocusNode()..requestFocus()),
+                    autofocus: true),
               ),
             ],
           ),
@@ -186,7 +186,7 @@ Future<String> changeDirectAccessPort(
                           r'^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$')),
                     ],
                     controller: controller,
-                    focusNode: FocusNode()..requestFocus()),
+                    autofocus: true),
               ),
             ],
           ),
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index c9af6328c..3c9a438a0 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -641,7 +641,7 @@ abstract class BasePeerCard extends StatelessWidget {
               child: Form(
                 child: TextFormField(
                   controller: controller,
-                  focusNode: FocusNode()..requestFocus(),
+                  autofocus: true,
                   decoration:
                       const InputDecoration(border: OutlineInputBorder()),
                 ),
@@ -1013,7 +1013,7 @@ void _rdpDialog(String id) async {
                     decoration: const InputDecoration(
                         border: OutlineInputBorder(), hintText: '3389'),
                     controller: portController,
-                    focusNode: FocusNode()..requestFocus(),
+                    autofocus: true,
                   ),
                 ),
               ],
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 2986adc7a..cde1e6d74 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -634,7 +634,7 @@ void setPasswordDialog() async {
                         border: const OutlineInputBorder(),
                         errorText: errMsg0.isNotEmpty ? errMsg0 : null),
                     controller: p0,
-                    focusNode: FocusNode()..requestFocus(),
+                    autofocus: true,
                     onChanged: (value) {
                       rxPass.value = value.trim();
                     },
diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart
index 9955c2768..27bb0377d 100644
--- a/flutter/lib/desktop/pages/file_manager_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_page.dart
@@ -798,7 +798,7 @@ class _FileManagerPageState extends State<FileManagerPage>
                                         "Please enter the folder name"),
                                   ),
                                   controller: name,
-                                  focusNode: FocusNode()..requestFocus(),
+                                  autofocus: true,
                                 ),
                               ],
                             ),