diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
index 833ba8924..044fcc214 100644
--- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
+++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
@@ -241,6 +241,8 @@ class ConversationBotSettingsDialogState
 
                       updateFromTextControllers();
 
+                      Navigator.of(context).pop(botOptions);
+
                       final bool isBotRoomMember =
                           await widget.room.botIsInRoom;
                       if (addBot && !isBotRoomMember) {
@@ -248,8 +250,6 @@ class ConversationBotSettingsDialogState
                       } else if (!addBot && isBotRoomMember) {
                         await widget.room.kick(BotName.byEnvironment);
                       }
-
-                      Navigator.of(context).pop(botOptions);
                     },
                     child: Text(L10n.of(context)!.confirm),
                   ),