diff --git a/lib/features/mailbox_creator/presentation/mailbox_creator_controller.dart b/lib/features/mailbox_creator/presentation/mailbox_creator_controller.dart
index 27b75b506..83a7923d2 100644
--- a/lib/features/mailbox_creator/presentation/mailbox_creator_controller.dart
+++ b/lib/features/mailbox_creator/presentation/mailbox_creator_controller.dart
@@ -1,3 +1,4 @@
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
@@ -55,6 +56,14 @@ class MailboxCreatorController extends BaseController
     }
   }
 
+  @override
+  void onReady() {
+    super.onReady();
+    if (PlatformInfo.isWeb) {
+      nameInputFocusNode.requestFocus();
+    }
+  }
+
   @override
   void onClose() {
     listMailboxNameAsStringExist = [];
diff --git a/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart b/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
index 338ccf043..c794c0282 100644
--- a/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
+++ b/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
@@ -256,17 +256,17 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
         ),
       );
 
-      bodyWidget = Center(child: bodyWidget);
+      bodyWidget = GestureDetector(
+        onTap: controller.nameInputFocusNode.unfocus,
+        child: Center(child: bodyWidget),
+      );
 
       if (PlatformInfo.isMobile) {
         bodyWidget = GestureDetector(
           onTap: controller.closeView,
           child: Scaffold(
             backgroundColor: AppColor.blackAlpha20,
-            body: GestureDetector(
-              onTap: controller.nameInputFocusNode.unfocus,
-              child: bodyWidget,
-            ),
+            body: bodyWidget,
           ),
         );
       }