diff --git a/src/Artemis.Core/Models/Profile/Folder.cs b/src/Artemis.Core/Models/Profile/Folder.cs
index 22184bd38..54635f8c1 100644
--- a/src/Artemis.Core/Models/Profile/Folder.cs
+++ b/src/Artemis.Core/Models/Profile/Folder.cs
@@ -128,13 +128,17 @@ namespace Artemis.Core
         }
 
         /// <summary>
-        ///     Creates a deep copy of the layer
+        ///     Creates a deep copy of the folder
         /// </summary>
         /// <returns>The newly created copy</returns>
         public Folder CreateCopy()
         {
-            FolderEntity entityCopy = JsonConvert.DeserializeObject<FolderEntity>(JsonConvert.SerializeObject(FolderEntity));
+            JsonSerializerSettings settings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };
+            FolderEntity entityCopy = JsonConvert.DeserializeObject<FolderEntity>(JsonConvert.SerializeObject(FolderEntity, settings), settings)!;
             entityCopy.Id = Guid.NewGuid();
+            entityCopy.Name += " - Copy";
+
+            // TODO Children
 
             return new Folder(Profile, Parent, entityCopy);
         }
diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs
index a0be455f1..9817e320f 100644
--- a/src/Artemis.Core/Models/Profile/Layer.cs
+++ b/src/Artemis.Core/Models/Profile/Layer.cs
@@ -122,9 +122,10 @@ namespace Artemis.Core
         /// <returns>The newly created copy</returns>
         public Layer CreateCopy()
         {
-            LayerEntity entityCopy = JsonConvert.DeserializeObject<LayerEntity>(JsonConvert.SerializeObject(LayerEntity));
+            JsonSerializerSettings settings = new JsonSerializerSettings {TypeNameHandling = TypeNameHandling.All};
+            LayerEntity entityCopy = JsonConvert.DeserializeObject<LayerEntity>(JsonConvert.SerializeObject(LayerEntity, settings), settings)!;
             entityCopy.Id = Guid.NewGuid();
-            entityCopy.Name = entityCopy.Name + " - Copy";
+            entityCopy.Name += " - Copy";
 
             Layer copy = new Layer(Profile, Parent, entityCopy);
             copy.ChangeLayerBrush(LayerBrush.Descriptor);