diff --git a/lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart b/lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart
index 791ed10e..2446ae81 100644
--- a/lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart
+++ b/lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart
@@ -18,4 +18,19 @@ abstract final class SpaceManagementCommunityDialogHelper {
       builder: (_) => EditCommunityDialog(community: community),
     );
   }
+
+  static void showLoadingDialog(BuildContext context) => showDialog<void>(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => const Center(
+          child: CircularProgressIndicator(),
+        ),
+      );
+
+  static void showSuccessSnackBar(BuildContext context, String message) =>
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(message),
+        ),
+      );
 }
diff --git a/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart b/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart
index 9094a632..1b4f10a1 100644
--- a/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart
+++ b/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart
@@ -16,6 +16,7 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
     on<LoadCommunities>(_onLoadCommunities);
     on<LoadMoreCommunities>(_onLoadMoreCommunities);
     on<InsertCommunity>(_onInsertCommunity);
+    on<CommunitiesUpdateCommunity>(_onCommunitiesUpdateCommunity);
   }
 
   final CommunitiesService _communitiesService;
@@ -114,4 +115,17 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
   ) {
     emit(state.copyWith(communities: [event.community, ...state.communities]));
   }
+
+  void _onCommunitiesUpdateCommunity(
+    CommunitiesUpdateCommunity event,
+    Emitter<CommunitiesState> emit,
+  ) {
+    emit(
+      state.copyWith(
+        communities: state.communities
+            .map((e) => e.uuid == event.community.uuid ? event.community : e)
+            .toList(),
+      ),
+    );
+  }
 }
diff --git a/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart b/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart
index cd14fa3d..9f8d1126 100644
--- a/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart
+++ b/lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart
@@ -31,3 +31,12 @@ final class InsertCommunity extends CommunitiesEvent {
   @override
   List<Object?> get props => [community];
 }
+
+final class CommunitiesUpdateCommunity extends CommunitiesEvent {
+  const CommunitiesUpdateCommunity(this.community);
+
+  final CommunityModel community;
+
+  @override
+  List<Object?> get props => [community];
+}
diff --git a/lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart b/lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart
index 2949145a..299c0078 100644
--- a/lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart
+++ b/lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/shared/widgets/community_dialog.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
@@ -20,19 +21,15 @@ class CreateCommunityDialog extends StatelessWidget {
       child: BlocConsumer<CreateCommunityBloc, CreateCommunityState>(
         listener: (context, state) {
           switch (state) {
-            case CreateCommunityLoading():
-              showDialog<void>(
-                context: context,
-                builder: (context) => const Center(
-                  child: CircularProgressIndicator(),
-                ),
-              );
+            case CreateCommunityLoading() || CreateCommunityInitial():
+              SpaceManagementCommunityDialogHelper.showLoadingDialog(context);
               break;
             case CreateCommunitySuccess(:final community):
               Navigator.of(context).pop();
               Navigator.of(context).pop();
-              ScaffoldMessenger.of(context).showSnackBar(
-                const SnackBar(content: Text('Community created successfully')),
+              SpaceManagementCommunityDialogHelper.showSuccessSnackBar(
+                context,
+                '${community.name} community created successfully',
               );
               context.read<CommunitiesBloc>().add(
                     InsertCommunity(community),
@@ -44,8 +41,6 @@ class CreateCommunityDialog extends StatelessWidget {
             case CreateCommunityFailure():
               Navigator.of(context).pop();
               break;
-            default:
-              break;
           }
         },
         builder: (BuildContext context, CreateCommunityState state) {
diff --git a/lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_state.dart b/lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_state.dart
index 9126be0a..14ca7f6e 100644
--- a/lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_state.dart
+++ b/lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_state.dart
@@ -21,10 +21,10 @@ final class UpdateCommunitySuccess extends UpdateCommunityState {
 }
 
 final class UpdateCommunityFailure extends UpdateCommunityState {
-  final String message;
+  final String errorMessage;
 
-  const UpdateCommunityFailure(this.message);
+  const UpdateCommunityFailure(this.errorMessage);
 
   @override
-  List<Object> get props => [message];
+  List<Object> get props => [errorMessage];
 }
diff --git a/lib/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart b/lib/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart
index f42cea78..e4c13f3c 100644
--- a/lib/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart
+++ b/lib/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/shared/widgets/community_dialog.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/update_community/data/services/remote_update_community_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_bloc.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
@@ -14,39 +16,35 @@ class EditCommunityDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (_) =>
-          UpdateCommunityBloc(RemoteUpdateCommunityService(HTTPService())),
+      create: (_) => UpdateCommunityBloc(
+        RemoteUpdateCommunityService(HTTPService()),
+      ),
       child: BlocConsumer<UpdateCommunityBloc, UpdateCommunityState>(
         listener: (context, state) {
           switch (state) {
-            case UpdateCommunityLoading():
-              showDialog<void>(
-                context: context,
-                builder: (context) => const Center(
-                  child: CircularProgressIndicator(),
-                ),
-              );
+            case UpdateCommunityInitial() || UpdateCommunityLoading():
+              SpaceManagementCommunityDialogHelper.showLoadingDialog(context);
               break;
             case UpdateCommunitySuccess(:final community):
               Navigator.of(context).pop();
               Navigator.of(context).pop();
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text('${community.name} updated successfully'),
-                ),
+              SpaceManagementCommunityDialogHelper.showSuccessSnackBar(
+                context,
+                '${community.name} community updated successfully',
               );
+              context.read<CommunitiesBloc>().add(
+                    CommunitiesUpdateCommunity(community),
+                  );
               break;
             case UpdateCommunityFailure():
               Navigator.of(context).pop();
               break;
-            default:
-              break;
           }
         },
         builder: (context, state) => CommunityDialog(
           title: const Text('Edit Community'),
           initialName: community.name,
-          errorMessage: state is UpdateCommunityFailure ? state.message : null,
+          errorMessage: state is UpdateCommunityFailure ? state.errorMessage : null,
           onSubmit: (name) => context.read<UpdateCommunityBloc>().add(
                 UpdateCommunity(community.copyWith(name: name)),
               ),