diff --git a/src/styles/styles.js b/src/styles/styles.js
index 64fb3bc6b30a..14b6d013666c 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -855,10 +855,11 @@ const styles = {
         backgroundColor: themeColors.buttonDefaultBG,
     },
 
-    autoGrowHeightInputContainer: (textInputHeight, maxHeight) => ({
-        height: textInputHeight >= maxHeight ? maxHeight : textInputHeight,
-        minHeight: variables.componentSizeLarge,
-    }),
+    autoGrowHeightInputContainer: (textInputHeight, maxHeight) => {
+        const minHeight = variables.componentSizeLarge;
+        const height = Math.min(Math.max(minHeight, textInputHeight), maxHeight);
+        return {height, minHeight};
+    },
 
     autoGrowHeightHiddenInput: (maxWidth, maxHeight) => ({
         maxWidth,