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 fd8552a97..7c9485708 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
@@ -12,33 +12,36 @@
             <ng-container *ngFor="let entry of componentLogEntries; let index = index">
                 <div class="bold">{{ entry.name }}</div>
                 <div [id]="getValueCellId(index)">
-                    <iqser-editable-input
-                        (save)="saveEdit($event, entry.originalKey)"
-                        [canEdit]="canEdit"
-                        [cancelTooltip]="'component-log-dialog.actions.cancel-edit' | translate"
-                        [editTooltip]="'component-log-dialog.actions.edit' | translate"
-                        [id]="'value-' + index"
-                        [parentId]="getValueCellId(index)"
-                        [saveTooltip]="'component-log-dialog.actions.save' | translate"
-                        [value]="entry.componentValues[0].value ?? entry.componentValues[0].originalValue"
-                        [attr.helpModeKey]="'scm_edit_DIALOG'"
-                    >
-                        <ng-container slot="editing">
-                            <iqser-circle-button
-                                (action)="undo(entry.originalKey)"
-                                *ngIf="entry.componentValues[0].value !== entry.componentValues[0].originalValue && canEdit"
-                                [showDot]="true"
-                                [tooltip]="
-                                    'component-log-dialog.actions.undo'
-                                        | translate: { value: entry.componentValues[0].originalValue }
-                                        | replaceNbsp
-                                "
-                                [attr.help-mode-key]="'scm_undo_DIALOG'"
-                                class="ml-2"
-                                icon="red:undo"
-                            ></iqser-circle-button>
-                        </ng-container>
-                    </iqser-editable-input>
+                    <ng-container *ngFor="let componentValue of entry.componentValues">
+                        <iqser-editable-input
+                            (save)="saveEdit($event, entry.originalKey)"
+                            [canEdit]="canEdit && entry.componentValues.length === 1"
+                            [cancelTooltip]="'component-log-dialog.actions.cancel-edit' | translate"
+                            [editTooltip]="'component-log-dialog.actions.edit' | translate"
+                            [id]="'value-' + index"
+                            [parentId]="getValueCellId(index)"
+                            [saveTooltip]="'component-log-dialog.actions.save' | translate"
+                            [value]="componentValue.value ?? componentValue.originalValue"
+                            [attr.helpModeKey]="'scm_edit_DIALOG'"
+                            [class.not-editable]="entry.componentValues.length !== 1"
+                        >
+                            <ng-container slot="editing">
+                                <iqser-circle-button
+                                    (action)="undo(entry.originalKey)"
+                                    *ngIf="componentValue.value !== componentValue.originalValue && canEdit"
+                                    [showDot]="true"
+                                    [tooltip]="
+                                        'component-log-dialog.actions.undo'
+                                            | translate: { value: componentValue.originalValue }
+                                            | replaceNbsp
+                                    "
+                                    [attr.help-mode-key]="'scm_undo_DIALOG'"
+                                    class="ml-2"
+                                    icon="red:undo"
+                                ></iqser-circle-button>
+                            </ng-container>
+                        </iqser-editable-input>
+                    </ng-container>
                 </div>
                 <div>{{ entry.componentValues[0].valueDescription }}</div>
                 <div>
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.scss
index c75e9dc4a..faa5f961e 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.scss
@@ -59,3 +59,8 @@ ul {
 .ml-auto {
     margin-left: auto;
 }
+
+.not-editable {
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
diff --git a/libs/common-ui b/libs/common-ui
index 54312abb6..962458fbf 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 54312abb6cc020e6ed213daafdaa2748ab390dec
+Subproject commit 962458fbf9095893474b7ab509d0ebf4136f64c5