diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 36a6aefe..a93679d0 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -414,21 +414,20 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         return;
       }
       result.add(space);
-      idToSpace[space.internalId] = space; 
+      idToSpace[space.internalId] = space;
 
       for (var child in space.children) {
         flatten(child);
       }
     }
 
-
     for (var space in spaces) {
       flatten(space);
     }
 
     for (var space in result) {
       if (space.parent != null) {
-        space.parent = idToSpace[space.parent!.internalId]; 
+        space.parent = idToSpace[space.parent!.internalId];
       }
     }
 
@@ -704,62 +703,26 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   void _duplicateSpace(SpaceModel space) {
-    final double horizontalGap = 250.0;
-    final double verticalGap = 180.0;
-    final double nodeWidth = 200;
-    final double nodeHeight = 100;
-    final double breathingSpace = 300.0;
-
-    /// Helper to recursively duplicate a node and its children
-    SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
-      final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-      final duplicated = SpaceModel(
-        name: duplicatedName,
-        icon: original.icon,
-        position: original.position,
-        isPrivate: original.isPrivate,
-        children: [],
-        status: SpaceStatus.newSpace,
-        parent: duplicatedParent,
-        spaceModel: original.spaceModel,
-        subspaces: original.subspaces,
-        tags: original.tags,
-      );
-
-      spaces.add(duplicated);
-
-      if (duplicatedParent != null) {
-        final newConnection = Connection(
-          startSpace: duplicatedParent,
-          endSpace: duplicated,
-          direction: "down",
-        );
-        connections.add(newConnection);
-
-        duplicated.incomingConnection = newConnection;
-        duplicatedParent.addOutgoingConnection(newConnection);
-        duplicatedParent.children.add(duplicated);
-      }
-
-      // Duplicate its children recursively
-      for (var child in original.children) {
-        duplicateRecursive(child, duplicated);
-      }
-
-      return duplicated;
-    }
-
-    /// Actual duplication process
     setState(() {
-      if (space.parent == null) {
-        // Duplicating a ROOT node
-        duplicateRecursive(space, null);
-        connections = createConnections(spaces);
-        realignTree();
-      } else {
-        final parent = space.parent!;
+      SpaceModel? parent = space.parent;
+
+      SpaceModel duplicated = _deepCloneSpaceTree(space, parent: parent);
+
+      duplicated.position = Offset(space.position.dx + 300, space.position.dy + 100);
+      List<SpaceModel> duplicatedSubtree = [];
+      void collectSubtree(SpaceModel node) {
+        duplicatedSubtree.add(node);
+        for (var child in node.children) {
+          collectSubtree(child);
+        }
+      }
+
+      collectSubtree(duplicated);
+      spaces.addAll(duplicatedSubtree);
+
+      if (parent != null) {
+        parent.children.add(duplicated);
 
-        final duplicated = duplicateRecursive(space, parent);
         final newConnection = Connection(
           startSpace: parent,
           endSpace: duplicated,
@@ -768,11 +731,44 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         connections.add(newConnection);
         duplicated.incomingConnection = newConnection;
         parent.addOutgoingConnection(newConnection);
-        parent.children.add(duplicated);
-        connections = createConnections(spaces);
-        realignTree();
-        //_realignSubtree(space.parent!);
       }
+
+      realignTree();
+      connections = createConnections(spaces);
     });
   }
+
+  SpaceModel _deepCloneSpaceTree(SpaceModel original, {SpaceModel? parent}) {
+    final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
+
+    final newSpace = SpaceModel(
+      name: duplicatedName,
+      icon: original.icon,
+      position: original.position,
+      isPrivate: original.isPrivate,
+      children: [],
+      status: SpaceStatus.newSpace,
+      spaceModel: original.spaceModel,
+      subspaces: original.subspaces,
+      tags: original.tags,
+      parent: parent,
+    );
+
+    for (var child in original.children) {
+      final duplicatedChild = _deepCloneSpaceTree(child, parent: newSpace);
+      newSpace.children.add(duplicatedChild);
+
+      final newConnection = Connection(
+        startSpace: newSpace,
+        endSpace: duplicatedChild,
+        direction: "down",
+      );
+      connections.add(newConnection);
+
+      duplicatedChild.incomingConnection = newConnection;
+      newSpace.addOutgoingConnection(newConnection);
+    }
+
+    return newSpace;
+  }
 }