diff --git a/packages/selection/src/js/selection.js b/packages/selection/src/js/selection.js
index e67cd3d5b0..3e6e58aa03 100644
--- a/packages/selection/src/js/selection.js
+++ b/packages/selection/src/js/selection.js
@@ -788,7 +788,7 @@
           }
 
           function selectButtonKeyDown(row, evt) {
-            if (evt.keyCode === 32) {
+            if (evt.keyCode === 32 || evt.keyCode === 13) {
               evt.preventDefault();
               selectButtonClick(row, evt);
             }
diff --git a/packages/selection/src/templates/selectionRowHeaderButtons.html b/packages/selection/src/templates/selectionRowHeaderButtons.html
index de8f0c6c77..c2ea8664cd 100644
--- a/packages/selection/src/templates/selectionRowHeaderButtons.html
+++ b/packages/selection/src/templates/selectionRowHeaderButtons.html
@@ -1,6 +1,7 @@
 <div
   class="ui-grid-selection-row-header-buttons ui-grid-icon-ok clickable"
   ng-class="{'ui-grid-row-selected': row.isSelected}"
+  tabindex="0"
   ng-click="selectButtonClick(row, $event)"
   ng-keydown="selectButtonKeyDown(row, $event)"
   role="checkbox"
diff --git a/packages/selection/src/templates/selectionSelectAllButtons.html b/packages/selection/src/templates/selectionSelectAllButtons.html
index e45e25fe70..99ef8824ed 100644
--- a/packages/selection/src/templates/selectionSelectAllButtons.html
+++ b/packages/selection/src/templates/selectionSelectAllButtons.html
@@ -1,5 +1,6 @@
 <div
 	role="button"
+  tabindex="0"
   class="ui-grid-selection-row-header-buttons ui-grid-icon-ok"
   ng-class="{'ui-grid-all-selected': grid.selection.selectAll}"
   ng-click="headerButtonClick($event)"
diff --git a/packages/tree-base/src/js/tree-base.js b/packages/tree-base/src/js/tree-base.js
index 36aaf1cf9c..a5d5cefb62 100644
--- a/packages/tree-base/src/js/tree-base.js
+++ b/packages/tree-base/src/js/tree-base.js
@@ -1609,6 +1609,11 @@
           evt.stopPropagation();
           uiGridTreeBaseService.toggleRowTreeState(self, row, evt);
         };
+        $scope.treeButtonKeyDown = function (row, evt) {
+          if (evt.keyCode === 32 || evt.keyCode === 13) {
+            $scope.treeButtonClick(row, evt);
+          }
+        };
       }
     };
   }]);
@@ -1645,6 +1650,11 @@
             uiGridTreeBaseService.expandAllRows(self, evt);
           }
         };
+        $scope.headerButtonKeyDown = function (evt) {
+          if (evt.keyCode === 32 || evt.keyCode === 13) {
+            $scope.headerButtonClick(self, evt);
+          }
+        };
       }
     };
   }]);
diff --git a/packages/tree-base/src/templates/treeBaseExpandAllButtons.html b/packages/tree-base/src/templates/treeBaseExpandAllButtons.html
index 5ff4bc41a1..b2fd253fba 100644
--- a/packages/tree-base/src/templates/treeBaseExpandAllButtons.html
+++ b/packages/tree-base/src/templates/treeBaseExpandAllButtons.html
@@ -1,5 +1,7 @@
 <div
   class="ui-grid-tree-base-row-header-buttons"
+  tabindex="0"
   ng-class="headerButtonClass()"
-  ng-click="headerButtonClick($event)">
+  ng-click="headerButtonClick($event)"
+  ng-keydown="headerButtonKeyDown($event)">
 </div>
diff --git a/packages/tree-base/src/templates/treeBaseRowHeaderButtons.html b/packages/tree-base/src/templates/treeBaseRowHeaderButtons.html
index c6e9993a6f..274926bdb6 100644
--- a/packages/tree-base/src/templates/treeBaseRowHeaderButtons.html
+++ b/packages/tree-base/src/templates/treeBaseRowHeaderButtons.html
@@ -1,6 +1,8 @@
 <div
   class="ui-grid-tree-base-row-header-buttons"
   ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }"
+  tabindex="0"
+  ng-keydown="treeButtonKeyDown(row, $event)"
   ng-click="treeButtonClick(row, $event)">
   <i
     ng-class="treeButtonClass(row)"