diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart
index ac3d9dacc..523f3002e 100644
--- a/lib/pages/new_group/new_group_view.dart
+++ b/lib/pages/new_group/new_group_view.dart
@@ -57,6 +57,9 @@ class NewGroupView extends StatelessWidget {
                   const SizedBox(width: 16),
                   Expanded(
                     child: TextField(
+                      // #Pangea
+                      maxLength: 32,
+                      // Pangea#
                       controller: controller.nameController,
                       autocorrect: false,
                       readOnly: controller.loading,
diff --git a/lib/pages/new_space/new_space_view.dart b/lib/pages/new_space/new_space_view.dart
index e550d0019..23f81b7ab 100644
--- a/lib/pages/new_space/new_space_view.dart
+++ b/lib/pages/new_space/new_space_view.dart
@@ -95,6 +95,9 @@ class NewSpaceView extends StatelessWidget {
                   const SizedBox(width: 16),
                   Expanded(
                     child: TextField(
+                      // #Pangea
+                      maxLength: 32,
+                      // Pangea#
                       controller: controller.nameController,
                       autocorrect: false,
                       readOnly: controller.loading,
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index 988ec3ff4..0e32fe478 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -42,6 +42,9 @@ class SettingsController extends State<Settings> {
       cancelLabel: L10n.of(context)!.cancel,
       textFields: [
         DialogTextField(
+          // #Pangea
+          maxLength: 32,
+          // Pangea#
           initialText: profile?.displayName ??
               Matrix.of(context).client.userID!.localpart,
         ),
diff --git a/lib/pangea/utils/set_class_name.dart b/lib/pangea/utils/set_class_name.dart
index 92909034a..1fd2ab66d 100644
--- a/lib/pangea/utils/set_class_name.dart
+++ b/lib/pangea/utils/set_class_name.dart
@@ -27,6 +27,7 @@ void setClassDisplayname(BuildContext context, String? roomId) async {
             : L10n.of(context)!.changeTheNameOfTheChat,
       ),
       content: TextField(
+        maxLength: 32,
         controller: textFieldController,
       ),
       actions: [