diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.html b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
index 626d9e089c..9e714f2154 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.html
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
@@ -1,7 +1,7 @@
 <div
     role="grid"
     *ngIf="data"
-    class="adf-full-width adf-datatable-list"
+    class="adf-datatable-list"
     [class.adf-sticky-header]="isStickyHeaderEnabled()"
     [class.adf-datatable--empty]="(isEmpty() && !isHeaderVisible()) || loading"
     [class.adf-datatable--empty--header-visible]="isEmpty() && isHeaderVisible()"
diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
index cbb1e417d9..65a10d5880 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
@@ -19,6 +19,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
 .adf-datatable {
     overflow-y: scroll;
     height: 100%;
+    display: block;
 
     .adf-full-width {
         width: 100%;
@@ -60,6 +61,8 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     border: 1px solid var(--adf-theme-foreground-text-color-007);
     box-sizing: border-box;
     overflow-x: auto;
+    min-width: 100%;
+    width: fit-content;
 
     @media screen and (-ms-high-contrast: active), screen and (-ms-high-contrast: none) {
         .adf-datatable-center-size-column-ie {
@@ -671,7 +674,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     .adf-datatable-body {
         display: block;
         flex: 1;
-        overflow-y: scroll;
+        overflow: hidden auto;
         margin-top: -1px;
     }
 }