diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index a54f85258aad..fb2fe134136e 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -644,7 +644,8 @@ class ReportActionCompose extends React.Component {
                                             displayFileInModal(file);
                                             this.setState({isDraggingOver: false});
                                         }}
-                                        style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4]}
+                                        style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.inputComposerPadding]}
+                                        defaultValue={this.props.comment}
                                         maxLines={this.state.maxLines}
                                         onFocus={() => this.setIsFocused(true)}
                                         onBlur={() => this.setIsFocused(false)}
diff --git a/src/styles/styles.js b/src/styles/styles.js
index f5b94a4dd978..840a5c9cf8bb 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1417,11 +1417,17 @@ const styles = {
     },
 
     textInputComposeSpacing: {
-        paddingVertical: 6,
+        paddingVertical: 1,
+        alignSelf: 'center',
         ...flex.flexRow,
         flex: 1,
     },
 
+    inputComposerPadding: {
+        flex: 4,
+        paddingVertical: 4,
+    },
+
     chatItemSubmitButton: {
         alignSelf: 'flex-end',
         borderRadius: 6,