diff --git a/src/internal/EnhancedButton.js b/src/internal/EnhancedButton.js
index 6c277693dbfade..9bec2487ad1dcb 100644
--- a/src/internal/EnhancedButton.js
+++ b/src/internal/EnhancedButton.js
@@ -1,4 +1,5 @@
 import React, {Component, PropTypes} from 'react';
+import ReactDOM from 'react-dom';
 import {createChildFragment} from '../utils/childUtils';
 import Events from '../utils/events';
 import keycode from 'keycode';
@@ -94,6 +95,10 @@ class EnhancedButton extends Component {
   componentDidMount() {
     injectStyle();
     listenForTabPresses();
+    if (this.state.isKeyboardFocused) {
+      ReactDOM.findDOMNode(this).focus();
+      this.props.onKeyboardFocus(null, true);
+    }
   }
 
   componentWillReceiveProps(nextProps) {