diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html
index bee5aae90..23a40a786 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html
@@ -13,7 +13,7 @@
                 <div class="bold">{{ entry.name }}</div>
                 <div [id]="getValueCellId(index)">
                     <iqser-editable-input
-                        (save)="saveEdit($event, entry.name)"
+                        (save)="saveEdit($event, entry.originalKey)"
                         [canEdit]="canEdit"
                         [cancelTooltip]="'component-log-dialog.actions.cancel-edit' | translate"
                         [editTooltip]="'component-log-dialog.actions.edit' | translate"
diff --git a/libs/red-domain/src/lib/component-log/component-log-entry.ts b/libs/red-domain/src/lib/component-log/component-log-entry.ts
index 9bd2ad4d8..6616c843f 100644
--- a/libs/red-domain/src/lib/component-log/component-log-entry.ts
+++ b/libs/red-domain/src/lib/component-log/component-log-entry.ts
@@ -4,15 +4,18 @@ export type ComponentDetails = Record<string, Record<'componentValues', ICompone
 
 export interface IComponentLogEntry {
     name: string;
+    originalKey: string;
     componentValues: IComponentValue[];
 }
 
 export class ComponentLogEntry implements IComponentLogEntry {
     readonly name: string;
+    readonly originalKey: string;
     readonly componentValues: ComponentValue[];
 
     constructor(entry: IComponentLogEntry) {
         this.name = entry.name.replaceAll('_', ' ');
+        this.originalKey = entry.name;
         this.componentValues = entry.componentValues;
     }
 }