diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css
index d258331abc..16b994b908 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css
@@ -110,11 +110,14 @@
     }
 }
 
-.mdl-data-table-fix-firefox{
+.mdl-data-table-fix-firefox {
     border-collapse: unset;
     border-spacing: 0;
 }
 
+.alfresco-datatable__row:focus {
+    outline-offset: -4px;
+}
 
 .alfresco-datatable__row--selected {
     color: rgb(68,138,255);
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
index 11be56699a..6417f7db92 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
@@ -32,6 +32,7 @@
     <tbody>
 
     <tr *ngFor="let row of data.getRows(); let idx = index" tabindex="0"
+        class="alfresco-datatable__row"
         [class.alfresco-datatable__row--selected]="selectedRow === row">
         <td *ngIf="multiselect">
             <label