diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/TextInput.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/TextInput.kt
index 7beac47cd..9c59e056c 100644
--- a/ui/components/src/main/kotlin/com/getcode/ui/components/TextInput.kt
+++ b/ui/components/src/main/kotlin/com/getcode/ui/components/TextInput.kt
@@ -73,6 +73,7 @@ fun TextInput(
     style: TextStyle = CodeTheme.typography.textMedium,
     placeholderStyle: TextStyle = CodeTheme.typography.textMedium,
     shape: Shape = CodeTheme.shapes.extraSmall,
+    contentAlignment: Alignment.Vertical = Alignment.CenterVertically,
     textFieldAlignment: Alignment = Alignment.CenterStart,
     colors: TextFieldColors = inputColors(),
     enabled: Boolean = true,
@@ -147,6 +148,7 @@ fun TextInput(
                     leadingIcon = leadingIcon,
                     trailingIcon = trailingIcon,
                     contentPadding = contentPadding,
+                    contentAlignment = contentAlignment,
                     textFieldAlignment = textFieldAlignment,
                     shape = shape,
                     innerTextField = it,
@@ -185,6 +187,7 @@ private fun DecoratorBox(
     leadingIcon: (@Composable () -> Unit)?,
     trailingIcon: (@Composable () -> Unit)?,
     shape: Shape,
+    contentAlignment: Alignment.Vertical = Alignment.CenterVertically,
     textFieldAlignment: Alignment = Alignment.CenterStart,
     innerTextField: @Composable () -> Unit,
 ) {
@@ -196,7 +199,7 @@ private fun DecoratorBox(
                 color = borderColor,
                 shape = shape,
             ),
-        verticalAlignment = Alignment.CenterVertically,
+        verticalAlignment = contentAlignment,
         horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.staticGrid.x2)
     ) {
         leadingIcon?.invoke()
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/ChatInput.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/ChatInput.kt
index 3d99ee096..925fb1959 100644
--- a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/ChatInput.kt
+++ b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/ChatInput.kt
@@ -52,6 +52,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.material.icons.rounded.ArrowUpward
+import androidx.compose.ui.Alignment
 import com.getcode.theme.extraSmall
 
 @Composable
@@ -87,6 +88,7 @@ fun ChatInput(
             keyboardOptions = KeyboardOptions.Default.copy(
                 capitalization = KeyboardCapitalization.Sentences
             ),
+            contentAlignment = Alignment.Bottom,
             contentPadding = PaddingValues(
                 start = CodeTheme.dimens.staticGrid.x3,
                 top = CodeTheme.dimens.staticGrid.x2,