diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 97d3b4b31ef6ac..a63ea7c133ba5f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -355,6 +355,19 @@ public void setCaretHidden(ReactEditText view, boolean caretHidden) {
   public void setSelectTextOnFocus(ReactEditText view, boolean selectTextOnFocus) {
     view.setSelectAllOnFocus(selectTextOnFocus);
   }
+  
+  @ReactProp(name = "enablesReturnKeyAutomatically", defaultBoolean = false)
+  public void setEnablesReturnKeyAutomatically(ReactEditText view, boolean enablesReturnKeyAutomatically) {
+    // if (enablesReturnKeyAutomatically && view.getText() !== "") {
+    //     view.setReturnKeyType("none");
+    // } else {
+    //     // TODO: Get the original value of "done"
+    //     view.setReturnKeyType("done"); 
+    // }
+    
+    // TODO: adjust to bool and currently set text
+    view.setImeOptions(EditorInfo.IME_ACTION_NONE);
+  }
 
   @ReactProp(name = ViewProps.COLOR, customType = "Color")
   public void setColor(ReactEditText view, @Nullable Integer color) {