diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
new file mode 100644
index 000000000..a286258f2
--- /dev/null
+++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
@@ -0,0 +1,89 @@
+import 'package:fluffychat/pangea/models/bot_options_model.dart';
+import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_mode_dynamic_zone.dart';
+import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_mode_select.dart';
+import 'package:fluffychat/pangea/widgets/space/language_level_dropdown.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:matrix/matrix.dart';
+
+class ConversationBotSettings extends StatefulWidget {
+  final Room? room;
+  final BotOptionsModel botOptions;
+
+  const ConversationBotSettings({
+    super.key,
+    this.room,
+    required this.botOptions,
+  });
+
+  @override
+  ConversationBotSettingsState createState() => ConversationBotSettingsState();
+}
+
+class ConversationBotSettingsState extends State<ConversationBotSettings> {
+  late BotOptionsModel botOptions;
+
+  ConversationBotSettingsState({Key? key});
+
+  @override
+  void initState() {
+    super.initState();
+    botOptions = widget.botOptions;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(12.0),
+          child: Text(
+            L10n.of(context)!.conversationLanguageLevel,
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.secondary,
+              fontWeight: FontWeight.bold,
+              fontSize: 16,
+            ),
+          ),
+        ),
+        LanguageLevelDropdown(
+          initialLevel: botOptions.languageLevel,
+          onChanged: (int? newValue) => {
+            setState(() {
+              botOptions.languageLevel = newValue!;
+            }),
+          },
+        ),
+        Text(
+          L10n.of(context)!.conversationBotModeSelectDescription,
+          style: TextStyle(
+            color: Theme.of(context).colorScheme.secondary,
+            fontWeight: FontWeight.bold,
+            fontSize: 16,
+          ),
+        ),
+        ConversationBotModeSelect(
+          initialMode: botOptions.mode,
+          onChanged: (String? mode) => {
+            setState(() {
+              botOptions.mode = mode ?? "discussion";
+            }),
+          },
+        ),
+        Padding(
+          padding: const EdgeInsets.all(12),
+          child: ConversationBotModeDynamicZone(
+            initialBotOptions: botOptions,
+            onChanged: (BotOptionsModel? newOptions) {
+              if (newOptions != null) {
+                setState(() {
+                  botOptions = newOptions;
+                });
+              }
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings_chat_details.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings_chat_details.dart
index a585922a7..e524f1430 100644
--- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings_chat_details.dart
+++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings_chat_details.dart
@@ -1,22 +1,19 @@
 import 'dart:developer';
 
+import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/bot_options_model.dart';
 import 'package:fluffychat/pangea/utils/bot_name.dart';
+import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/pangea/widgets/common/bot_face_svg.dart';
-import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_mode_dynamic_zone.dart';
-import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_mode_select.dart';
-import 'package:fluffychat/pangea/widgets/space/language_level_dropdown.dart';
+import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_settings.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
 
-import '../../../widgets/matrix.dart';
-import '../../constants/pangea_event_types.dart';
-import '../../extensions/pangea_room_extension/pangea_room_extension.dart';
-import '../../utils/error_handler.dart';
-
 class ConversationBotSettingsChatDetails extends StatefulWidget {
   final Room? room;
   final bool startOpen;
@@ -60,6 +57,21 @@ class ConversationBotSettingsChatDetailsState
         : null;
   }
 
+  Future<void> setBotOption() async {
+    if (widget.room == null) return;
+    try {
+      await Matrix.of(context).client.setRoomStateWithKey(
+            widget.room!.id,
+            PangeaEventTypes.botOptions,
+            '',
+            botOptions.toJson(),
+          );
+    } catch (err, stack) {
+      debugger(when: kDebugMode);
+      ErrorHandler.logError(e: err, s: stack);
+    }
+  }
+
   Future<void> updateBotOption(void Function() makeLocalChange) async {
     makeLocalChange();
     await showFutureLoadingDialog(
@@ -76,21 +88,6 @@ class ConversationBotSettingsChatDetailsState
     );
   }
 
-  Future<void> setBotOption() async {
-    if (widget.room == null) return;
-    try {
-      await Matrix.of(context).client.setRoomStateWithKey(
-            widget.room!.id,
-            PangeaEventTypes.botOptions,
-            '',
-            botOptions.toJson(),
-          );
-    } catch (err, stack) {
-      debugger(when: kDebugMode);
-      ErrorHandler.logError(e: err, s: stack);
-    }
-  }
-
   @override
   Widget build(BuildContext context) => AnimatedContainer(
         duration: const Duration(milliseconds: 300),
@@ -160,68 +157,9 @@ class ConversationBotSettingsChatDetailsState
                                         Radius.circular(10),
                                       ),
                                     ),
-                                    child: Column(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        Padding(
-                                          padding: const EdgeInsets.all(12.0),
-                                          child: Text(
-                                            L10n.of(context)!
-                                                .conversationLanguageLevel,
-                                            style: TextStyle(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .secondary,
-                                              fontWeight: FontWeight.bold,
-                                              fontSize: 16,
-                                            ),
-                                          ),
-                                        ),
-                                        LanguageLevelDropdown(
-                                          initialLevel:
-                                              botOptions.languageLevel,
-                                          onChanged: (int? newValue) => {
-                                            setState(() {
-                                              botOptions.languageLevel =
-                                                  newValue!;
-                                            }),
-                                          },
-                                        ),
-                                        Text(
-                                          L10n.of(context)!
-                                              .conversationBotModeSelectDescription,
-                                          style: TextStyle(
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .secondary,
-                                            fontWeight: FontWeight.bold,
-                                            fontSize: 16,
-                                          ),
-                                        ),
-                                        ConversationBotModeSelect(
-                                          initialMode: botOptions.mode,
-                                          onChanged: (String? mode) => {
-                                            setState(() {
-                                              botOptions.mode =
-                                                  mode ?? "discussion";
-                                            }),
-                                          },
-                                        ),
-                                        Padding(
-                                          padding: const EdgeInsets.all(12),
-                                          child: ConversationBotModeDynamicZone(
-                                            initialBotOptions: botOptions,
-                                            onChanged:
-                                                (BotOptionsModel? newOptions) {
-                                              if (newOptions != null) {
-                                                setState(() {
-                                                  botOptions = newOptions;
-                                                });
-                                              }
-                                            },
-                                          ),
-                                        ),
-                                      ],
+                                    child: ConversationBotSettings(
+                                      room: widget.room,
+                                      botOptions: botOptions,
                                     ),
                                   ),
                                 ),
diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings_create_group.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings_create_group.dart
index 49d3df9c0..5542e3ec8 100644
--- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings_create_group.dart
+++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings_create_group.dart
@@ -1,22 +1,13 @@
-import 'dart:developer';
-
+import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/models/bot_options_model.dart';
 import 'package:fluffychat/pangea/utils/bot_name.dart';
 import 'package:fluffychat/pangea/widgets/common/bot_face_svg.dart';
-import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_mode_dynamic_zone.dart';
-import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_mode_select.dart';
-import 'package:fluffychat/pangea/widgets/space/language_level_dropdown.dart';
-import 'package:flutter/foundation.dart';
+import 'package:fluffychat/pangea/widgets/conversation_bot/conversation_bot_settings.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
 
-import '../../../widgets/matrix.dart';
-import '../../constants/pangea_event_types.dart';
-import '../../extensions/pangea_room_extension/pangea_room_extension.dart';
-import '../../utils/error_handler.dart';
-
 class ConversationBotSettingsCreateGroup extends StatefulWidget {
   final Room? room;
   final bool startOpen;
@@ -60,37 +51,6 @@ class ConversationBotSettingsCreateGroupState
         : null;
   }
 
-  Future<void> updateBotOption(void Function() makeLocalChange) async {
-    makeLocalChange();
-    await showFutureLoadingDialog(
-      context: context,
-      future: () async {
-        try {
-          await setBotOption();
-        } catch (err, stack) {
-          debugger(when: kDebugMode);
-          ErrorHandler.logError(e: err, s: stack);
-        }
-        setState(() {});
-      },
-    );
-  }
-
-  Future<void> setBotOption() async {
-    if (widget.room == null) return;
-    try {
-      await Matrix.of(context).client.setRoomStateWithKey(
-            widget.room!.id,
-            PangeaEventTypes.botOptions,
-            '',
-            botOptions.toJson(),
-          );
-    } catch (err, stack) {
-      debugger(when: kDebugMode);
-      ErrorHandler.logError(e: err, s: stack);
-    }
-  }
-
   @override
   Widget build(BuildContext context) => AnimatedContainer(
         duration: const Duration(milliseconds: 300),
@@ -174,62 +134,10 @@ class ConversationBotSettingsCreateGroupState
               ),
             ),
             if (addBot) ...[
-              Padding(
-                padding: const EdgeInsets.fromLTRB(16, 0, 0, 0),
-                child: Text(
-                  L10n.of(context)!.conversationLanguageLevel,
-                  style: TextStyle(
-                    color: Theme.of(context).colorScheme.secondary,
-                    fontWeight: FontWeight.bold,
-                    fontSize: 16,
-                  ),
-                ),
+              ConversationBotSettings(
+                room: widget.room,
+                botOptions: botOptions,
               ),
-              Padding(
-                padding: const EdgeInsets.only(left: 16),
-                child: LanguageLevelDropdown(
-                  initialLevel: botOptions.languageLevel,
-                  onChanged: (int? newValue) => updateBotOption(() {
-                    botOptions.languageLevel = newValue!;
-                  }),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.fromLTRB(32, 16, 0, 0),
-                child: Text(
-                  L10n.of(context)!.conversationBotModeSelectDescription,
-                  style: TextStyle(
-                    color: Theme.of(context).colorScheme.secondary,
-                    fontWeight: FontWeight.bold,
-                    fontSize: 16,
-                  ),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.only(left: 16),
-                child: ConversationBotModeSelect(
-                  initialMode: botOptions.mode,
-                  onChanged: (String? mode) => updateBotOption(
-                    () {
-                      botOptions.mode = mode ?? "discussion";
-                    },
-                  ),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.fromLTRB(28, 0, 12, 0),
-                child: ConversationBotModeDynamicZone(
-                  initialBotOptions: botOptions,
-                  onChanged: (BotOptionsModel? newOptions) {
-                    updateBotOption(() {
-                      if (newOptions != null) {
-                        botOptions = newOptions;
-                      }
-                    });
-                  },
-                ),
-              ),
-              const SizedBox(height: 16),
             ],
           ],
         ),