diff --git a/Examples/UIExplorer/TextInputExample.js b/Examples/UIExplorer/TextInputExample.js
index 656ccd4fc..e10dbc0f1 100644
--- a/Examples/UIExplorer/TextInputExample.js
+++ b/Examples/UIExplorer/TextInputExample.js
@@ -185,4 +185,37 @@ exports.examples = [
       );
     }
   },
+  {
+    title: 'Clear button mode',
+    render: function () {
+      return (
+        <View>
+          <WithLabel label="never">
+            <TextInput
+              style={styles.default}
+              clearButtonMode={TextInput.clearButtonModeTypes.never}
+            />
+          </WithLabel>
+          <WithLabel label="while editing">
+            <TextInput
+              style={styles.default}
+              clearButtonMode={TextInput.clearButtonModeTypes.whileEditing}
+            />
+          </WithLabel>
+          <WithLabel label="unless editing">
+            <TextInput
+              style={styles.default}
+              clearButtonMode={TextInput.clearButtonModeTypes.unlessEditing}
+            />
+          </WithLabel>
+          <WithLabel label="always">
+            <TextInput
+              style={styles.default}
+              clearButtonMode={TextInput.clearButtonModeTypes.always}
+            />
+          </WithLabel>
+        </View>
+      );
+    }
+  },
 ];
diff --git a/ReactKit/Modules/RCTUIManager.m b/ReactKit/Modules/RCTUIManager.m
index 844fd2597..0b34a820b 100644
--- a/ReactKit/Modules/RCTUIManager.m
+++ b/ReactKit/Modules/RCTUIManager.m
@@ -1293,6 +1293,14 @@ static void RCTSetShadowViewProps(NSDictionary *props, RCTShadowView *shadowView
         @"None": @(UITextAutocapitalizationTypeNone),
       },
     },
+    @"UITextField": @{
+      @"clearButtonMode": @{
+        @"Never": @(UITextFieldViewModeNever),
+        @"WhileEditing": @(UITextFieldViewModeWhileEditing),
+        @"UnlessEditing": @(UITextFieldViewModeUnlessEditing),
+        @"Always": @(UITextFieldViewModeAlways),
+      },
+    },
     @"UIView": @{
       @"ContentMode": @{
         @"ScaleToFill": @(UIViewContentModeScaleToFill),
diff --git a/ReactKit/Views/RCTTextFieldManager.m b/ReactKit/Views/RCTTextFieldManager.m
index 339a7803e..368bf1d7d 100644
--- a/ReactKit/Views/RCTTextFieldManager.m
+++ b/ReactKit/Views/RCTTextFieldManager.m
@@ -19,6 +19,7 @@ RCT_EXPORT_VIEW_PROPERTY(enabled)
 RCT_EXPORT_VIEW_PROPERTY(placeholder)
 RCT_EXPORT_VIEW_PROPERTY(text)
 RCT_EXPORT_VIEW_PROPERTY(font)
+RCT_EXPORT_VIEW_PROPERTY(clearButtonMode)
 RCT_REMAP_VIEW_PROPERTY(autoCapitalize, autocapitalizationType)
 RCT_EXPORT_VIEW_PROPERTY(keyboardType)
 RCT_REMAP_VIEW_PROPERTY(color, textColor)