diff --git a/src/List/ListItem.js b/src/List/ListItem.js
index 4b1b8bb90b651b..29e786ee9b1125 100644
--- a/src/List/ListItem.js
+++ b/src/List/ListItem.js
@@ -678,7 +678,6 @@ class ListItem extends Component {
             <EnhancedButton
               containerElement="span"
               {...other}
-              disabled={disabled}
               disableKeyboardFocus={disableKeyboardFocus || this.state.rightIconButtonKeyboardFocused}
               onKeyboardFocus={this.handleKeyboardFocus}
               onMouseLeave={this.handleMouseLeave}
diff --git a/src/internal/EnhancedButton.js b/src/internal/EnhancedButton.js
index 0fb920443ec5b6..1d238e445bda7f 100644
--- a/src/internal/EnhancedButton.js
+++ b/src/internal/EnhancedButton.js
@@ -338,7 +338,7 @@ class EnhancedButton extends Component {
       onKeyUp: this.handleKeyUp,
       onKeyDown: this.handleKeyDown,
       onTouchTap: this.handleTouchTap,
-      tabIndex: tabIndex,
+      tabIndex: disabled || disableKeyboardFocus ? -1 : tabIndex,
       type: type,
     };
     const buttonChildren = this.createButtonChildren();
diff --git a/src/internal/EnhancedButton.spec.js b/src/internal/EnhancedButton.spec.js
index c39a52c58dfcae..40058b79430e8d 100644
--- a/src/internal/EnhancedButton.spec.js
+++ b/src/internal/EnhancedButton.spec.js
@@ -16,6 +16,7 @@ describe('<EnhancedButton />', () => {
     );
     assert.ok(wrapper.text(), 'Button', 'should say Button');
     assert.ok(wrapper.is('button'), 'should match a button element');
+    assert.strictEqual(wrapper.props().tabIndex, 0, 'should receive the focus');
   });
 
   it('renders a link when href is provided', () => {
@@ -244,6 +245,17 @@ describe('<EnhancedButton />', () => {
     assert.strictEqual(wrapper.find('FocusRipple').length, 0, 'should not have a FocusRipple');
   });
 
+  describe('prop: disabled', () => {
+    it('should have no ripples when button is disabled', () => {
+      const wrapper = shallowWithContext(
+        <EnhancedButton keyboardFocused={true} disabled={true}>Button</EnhancedButton>
+      );
+      assert.strictEqual(wrapper.find('TouchRipple').length, 0, 'should not have a TouchRipple');
+      assert.strictEqual(wrapper.find('FocusRipple').length, 0, 'should not have a FocusRipple');
+      assert.strictEqual(wrapper.props().tabIndex, -1, 'should not receive the focus');
+    });
+  });
+
   it('should have no ripples when both are disabled', () => {
     const wrapper = shallowWithContext(
       <EnhancedButton
@@ -258,14 +270,6 @@ describe('<EnhancedButton />', () => {
     assert.strictEqual(wrapper.find('FocusRipple').length, 0, 'should not have a FocusRipple');
   });
 
-  it('should have no ripples when button is disabled', () => {
-    const wrapper = shallowWithContext(
-      <EnhancedButton keyboardFocused={true} disabled={true}>Button</EnhancedButton>
-    );
-    assert.strictEqual(wrapper.find('TouchRipple').length, 0, 'should not have a TouchRipple');
-    assert.strictEqual(wrapper.find('FocusRipple').length, 0, 'should not have a FocusRipple');
-  });
-
   it('should fire the touchtap handler if keyboard focused and the enter or space keys are hit', () => {
     const eventStack = [];
     eventStack.reset = () => eventStack.splice(0, eventStack.length);