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 38c2fba90..6d9a13f8d 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
@@ -5,6 +5,16 @@
   }"
 >
   <span
+    role="link"
+    [attr.aria-label]="
+      (isFile()
+        ? 'CUSTOM_NAME_COLUMN.ACCESSIBILITY.FILE_LINK_ARIA_LABEL'
+        : 'CUSTOM_NAME_COLUMN.ACCESSIBILITY.FOLDER_LINK_ARIA_LABEL')
+        | translate
+          : {
+              name: displayText$ | async
+            }
+    "
     class="adf-datatable-cell-value"
     title="{{ node | adfNodeNameTooltip }}"
     (click)="onClick()"
diff --git a/src/app/components/dl-custom-components/name-column/name-column.component.scss b/src/app/components/dl-custom-components/name-column/name-column.component.scss
index c2e16905e..6fb9aabe5 100644
--- a/src/app/components/dl-custom-components/name-column/name-column.component.scss
+++ b/src/app/components/dl-custom-components/name-column/name-column.component.scss
@@ -16,4 +16,8 @@
 .aca-custom-name-column {
   display: block;
   align-items: center;
+
+  .adf-datatable-cell-value {
+    margin: 0 4px;
+  }
 }
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 4fce522e3..3a34def4d 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
@@ -102,7 +102,7 @@ export class CustomNameColumnComponent extends NameColumnComponent
   }
 
   isFile(): boolean {
-    return this.node && this.node.entry && this.node.entry.isFile;
+    return this.node && this.node.entry && !this.node.entry.isFolder;
   }
 
   isFileWriteLocked(): boolean {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 9f798f6ef..5c5c21c29 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -499,5 +499,11 @@
                 "TOOLTIP": "Upload new version"
             }
         }
+    },
+    "CUSTOM_NAME_COLUMN": {
+        "ACCESSIBILITY": {
+            "FILE_LINK_ARIA_LABEL": "View file {{ name }}",
+            "FOLDER_LINK_ARIA_LABEL": "Open {{ name }} folder"
+        }
     }
 }