diff --git a/src/app/components/dl-custom-components/name-column/name-column.component.html b/src/app/components/dl-custom-components/name-column/name-column.component.html
index 6d9a13f8d..0211f5288 100644
--- a/src/app/components/dl-custom-components/name-column/name-column.component.html
+++ b/src/app/components/dl-custom-components/name-column/name-column.component.html
@@ -17,7 +17,7 @@
     "
     class="adf-datatable-cell-value"
     title="{{ node | adfNodeNameTooltip }}"
-    (click)="onClick()"
+    (click)="onLinkClick($event)"
   >
     {{ displayText$ | async }}
   </span>
diff --git a/src/app/components/dl-custom-components/name-column/name-column.component.spec.ts b/src/app/components/dl-custom-components/name-column/name-column.component.spec.ts
index 166831681..597d14b2d 100644
--- a/src/app/components/dl-custom-components/name-column/name-column.component.spec.ts
+++ b/src/app/components/dl-custom-components/name-column/name-column.component.spec.ts
@@ -105,4 +105,21 @@ describe('CustomNameColumnComponent', () => {
       fixture.debugElement.nativeElement.querySelector('aca-locked-by')
     ).not.toBe(null);
   });
+
+  it('should call parent component onClick method', () => {
+    const event = new MouseEvent('click');
+    spyOn(component, 'onClick');
+
+    component.onLinkClick(event);
+
+    expect(component.onClick).toHaveBeenCalled();
+  });
+
+  it('should prevent event propagation', () => {
+    const event = new MouseEvent('click');
+    spyOn(event, 'stopPropagation');
+
+    component.onLinkClick(event);
+    expect(event.stopPropagation).toHaveBeenCalled();
+  });
 });
diff --git a/src/app/components/dl-custom-components/name-column/name-column.component.ts b/src/app/components/dl-custom-components/name-column/name-column.component.ts
index 3a34def4d..d8efe9659 100644
--- a/src/app/components/dl-custom-components/name-column/name-column.component.ts
+++ b/src/app/components/dl-custom-components/name-column/name-column.component.ts
@@ -94,6 +94,11 @@ export class CustomNameColumnComponent extends NameColumnComponent
       });
   }
 
+  onLinkClick(event: Event) {
+    event.stopPropagation();
+    this.onClick();
+  }
+
   ngOnDestroy() {
     super.ngOnDestroy();