diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
index 5c9522ac86b..fd82fdf2f76 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
@@ -101,7 +101,7 @@
             </mat-expansion-panel-header>
             <div *ngIf="currentPanel.panelTitle === DefaultPanels.TAGS && !editing" class="adf-metadata-properties-tags">
                 <mat-chip-set>
-                    <mat-chip *ngFor="let tag of tags" [disableRipple]="true" data-automation-id="metadata-properties-tag-chip">{{ tag }}</mat-chip>
+                    <mat-chip *ngFor="let tag of tags" [disableRipple]="true" class="metadata-properties-tag-chip" data-automation-id="metadata-properties-tag-chip">{{ tag }}</mat-chip>
                 </mat-chip-set>
             </div>
             <div *ngIf="showEmptyTagMessage" class="adf-metadata-no-item-added">
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss
index ca3636fbf0b..72ff945deaa 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss
@@ -67,6 +67,10 @@ $panel-properties-height: 56px !default;
         #{$mat-chip} {
             background: var(--adf-metadata-buttons-background-color);
             padding: 6px;
+
+            &.metadata-properties-tag-chip {
+                overflow: hidden;
+            }
         }
 
         .adf-metadata-no-item-added {