diff --git a/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts b/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts
index 5cf023bb0..e3fbf05e8 100644
--- a/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/add-edit-entity/add-edit-entity.component.ts
@@ -203,7 +203,7 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
         let technicalName = baseTechnicalName.replaceAll(/[^A-Za-z0-9_-]/g, '');
         let suffix = 1;
         while (existingTechnicalNames.includes(technicalName)) {
-            technicalName = [baseTechnicalName, suffix++].join('_');
+            technicalName = [technicalName, suffix++].join('_');
         }
         return technicalName;
     }