diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index 66035545b30a..24a8c3cbbe47 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -92,8 +92,10 @@ - (void)invalidateContentSize
 
   if (_maximumNumberOfLines == 1) {
     maximumSize.width = CGFLOAT_MAX;
+    maximumSize.height -= self.paddingTop.value + self.paddingBottom.value + self.borderWidth;
   } else {
     maximumSize.height = CGFLOAT_MAX;
+    maximumSize.width -= self.paddingLeft.value + self.paddingRight.value + self.borderWidth;
   }
 
   CGSize contentSize = [self sizeThatFitsMinimumSize:(CGSize)CGSizeZero maximumSize:maximumSize];