diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
index 5885c1f6d05..d88f628c8ac 100644
--- a/src/renderers/dom/shared/ReactDOMComponent.js
+++ b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -661,14 +661,33 @@ ReactDOMComponent.Mixin = {
           inputPostMount,
           this
         );
+        if (props.autoFocus) {
+          transaction.getReactMountReady().enqueue(
+            AutoFocusUtils.focusDOMComponent,
+            this
+          );
+        }
         break;
       case 'textarea':
         transaction.getReactMountReady().enqueue(
           textareaPostMount,
           this
         );
+        if (props.autoFocus) {
+          transaction.getReactMountReady().enqueue(
+            AutoFocusUtils.focusDOMComponent,
+            this
+          );
+        }
         break;
       case 'select':
+        if (props.autoFocus) {
+          transaction.getReactMountReady().enqueue(
+            AutoFocusUtils.focusDOMComponent,
+            this
+          );
+        }
+        break;
       case 'button':
         if (props.autoFocus) {
           transaction.getReactMountReady().enqueue(