diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 064d6481cf8434..01be272a82a289 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -89,6 +89,16 @@ class Modal extends React.Component {
      * - `none` appears without an animation
      */
     animationType: PropTypes.oneOf(['none', 'slide', 'fade']),
+    /**
+     * The `softInputMode` prop controls soft input mode for the modal window.
+     *
+     * - `unspecified` The system will try to pick a mode, `resize` or `pan`.
+     * - `resize` Window is resized when an input method is shown. This mode is ignored if the window is fullscreen.
+     * - `pan` Window is panned to ensure the current input focus is visible.
+     * - `nothing` Window is neither resized nor panned when an input method is shown.
+     * @platform android
+     */
+    softInputMode: PropTypes.oneOf(['unspecified', 'resize', 'pan', 'nothing']),
     /**
      * The `transparent` prop determines whether your modal will fill the entire view. Setting this to `true` will render the modal over a transparent background.
      */
@@ -132,6 +142,7 @@ class Modal extends React.Component {
   static defaultProps = {
     visible: true,
     hardwareAccelerated: false,
+    softInputMode: 'resize',
   };
 
   static contextTypes = {
@@ -165,6 +176,7 @@ class Modal extends React.Component {
     return (
       <RCTModalHostView
         animationType={animationType}
+        softInputMode={this.props.softInputMode}
         transparent={this.props.transparent}
         hardwareAccelerated={this.props.hardwareAccelerated}
         onRequestClose={this.props.onRequestClose}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
index 68d4c91f1e9773..5ce90dc57e96cb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
@@ -61,6 +61,11 @@ public void setAnimationType(ReactModalHostView view, String animationType) {
     view.setAnimationType(animationType);
   }
 
+  @ReactProp(name = "softInputMode")
+  public void setSoftInputMode(ReactModalHostView view, String softInputMode) {
+    view.setSoftInputMode(softInputMode);
+  }
+
   @ReactProp(name = "transparent")
   public void setTransparent(ReactModalHostView view, boolean transparent) {
     view.setTransparent(transparent);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index 98ad5e0d6fcc7b..95680e3fb61611 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -61,6 +61,7 @@ public interface OnRequestCloseListener {
   private @Nullable Dialog mDialog;
   private boolean mTransparent;
   private String mAnimationType;
+  private String mSoftInputMode;
   private boolean mHardwareAccelerated;
   // Set this flag to true if changing a particular property on the view requires a new Dialog to
   // be created.  For instance, animation does since it affects Dialog creation through the theme
@@ -154,6 +155,10 @@ protected void setAnimationType(String animationType) {
     mPropertyRequiresNewDialog = true;
   }
 
+  protected void setSoftInputMode(String softInputMode) {
+    mSoftInputMode = softInputMode;
+  }
+
   protected void setHardwareAccelerated(boolean hardwareAccelerated) {
     mHardwareAccelerated = hardwareAccelerated;
     mPropertyRequiresNewDialog = true;
@@ -242,7 +247,6 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
         }
       });
 
-    mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     if (mHardwareAccelerated) {
       mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
     }
@@ -278,6 +282,18 @@ private void updateProperties() {
           WindowManager.LayoutParams.FLAG_DIM_BEHIND,
           WindowManager.LayoutParams.FLAG_DIM_BEHIND);
     }
+
+    switch (mSoftInputMode) {
+      case "resize":
+        mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        break;
+      case "pan":
+        mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+        break;
+      case "nothing":
+        mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+        break;
+    }
   }
 
   /**