diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 1b15d43e30..7b3111d25d 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -211,7 +211,7 @@
                 </mat-menu>
             </adf-toolbar>
 
-            <div [ngClass]="{'adf-sticky-document-list': stickyHeader }">
+            <div class="adf-document-list-container" [ngClass]="{'adf-sticky-document-list': stickyHeader }">
                 <adf-document-list
                 #documentList
                 class="adf-file-list-container"
diff --git a/demo-shell/src/app/components/files/files.component.scss b/demo-shell/src/app/components/files/files.component.scss
index a270ba8d1f..4761478875 100644
--- a/demo-shell/src/app/components/files/files.component.scss
+++ b/demo-shell/src/app/components/files/files.component.scss
@@ -44,6 +44,14 @@
         height: 32px;
     }
 
+    .adf-document-list-container {
+        min-height: 400px;
+
+        .adf-datatable-list {
+            min-height: 400px;
+        }
+    }
+
     .adf-datatable-card .adf-lock-button {
         top: -10px;
     }
diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss
index 6c3de6beec..1a227e5d22 100644
--- a/lib/core/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/datatable/components/datatable/datatable.component.scss
@@ -181,7 +181,7 @@
                 @include material-animation-default(0.28s);
                 transition-property: background-color;
                 border-top: $data-table-dividers;
-                min-height: 65px;
+                min-height: $data-table-row-height;
                 cursor: pointer;
 
                 @include adf-no-select;
@@ -193,6 +193,10 @@
                 &.adf-is-selected, &.adf-is-selected:hover {
                     background-color: $data-table-selection-color;
                 }
+
+                &:last-child {
+                    border-bottom: $data-table-dividers;
+                }
             }
         }
 
@@ -533,6 +537,7 @@
         .adf-datatable-body {
             .adf-datatable-row {
                 background-color: mat-color($background, card);
+                border: none !important;
 
                 &:hover, &:focus {
                     background-color: unset;
diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts
index 8bca8a44a1..123360db92 100644
--- a/lib/core/datatable/components/datatable/datatable.component.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.ts
@@ -43,7 +43,8 @@ export enum DisplayMode {
     selector: 'adf-datatable',
     styleUrls: ['./datatable.component.scss'],
     templateUrl: './datatable.component.html',
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    host: { class: 'adf-datatable' }
 })
 export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck, OnDestroy {