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 255c07138e..1b4e88229b 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.html
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
@@ -65,7 +65,7 @@
                     [ngClass]="{ 'adf-datatable-cell-header-content--hovered':
                         hoveredHeaderColumnIndex === columnIndex &&
                         !isDraggingHeaderColumn &&
-                        !isResizing }"
+                        !isResizing && col.sortable}"
                 >
                     <span
                         *ngIf="hoveredHeaderColumnIndex === columnIndex && col.draggable && !isResizing"
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 e21a17f0ef..d17a7018b4 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
@@ -229,6 +229,8 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default;
         box-sizing: border-box;
 
         .adf-datatable-row {
+            padding-right: 15px;
+
             &:hover,
             &:focus {
                 background-color: inherit;