diff --git a/lib/features/chat/widgets/modern_chat_input.dart b/lib/features/chat/widgets/modern_chat_input.dart
index d1a1632..e002d47 100644
--- a/lib/features/chat/widgets/modern_chat_input.dart
+++ b/lib/features/chat/widgets/modern_chat_input.dart
@@ -786,7 +786,7 @@ class _ModernChatInputState extends ConsumerState<ModernChatInput>
             Spacing.sm,
           ),
           child: Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.end,
             children: [
               _buildOverflowButton(
                 tooltip: AppLocalizations.of(context)!.more,
@@ -796,42 +796,47 @@ class _ModernChatInputState extends ConsumerState<ModernChatInput>
               ),
               const SizedBox(width: Spacing.sm),
               Expanded(
-                child: AnimatedContainer(
-                  duration: const Duration(milliseconds: 180),
-                  curve: Curves.easeOutCubic,
-                  padding: const EdgeInsets.symmetric(horizontal: Spacing.md),
-                  constraints: const BoxConstraints(
-                    minHeight: TouchTarget.input,
+                child: ConstrainedBox(
+                  constraints: BoxConstraints(
+                    maxHeight: MediaQuery.of(context).size.height * 0.25,
                   ),
-                  decoration: BoxDecoration(
-                    color: composerSurface.withValues(
-                      alpha: brightness == Brightness.dark ? 0.9 : 0.2,
+                  child: AnimatedContainer(
+                    duration: const Duration(milliseconds: 180),
+                    curve: Curves.easeOutCubic,
+                    padding: const EdgeInsets.symmetric(horizontal: Spacing.md),
+                    constraints: const BoxConstraints(
+                      minHeight: TouchTarget.input,
                     ),
-                    borderRadius: BorderRadius.circular(AppBorderRadius.round),
-                    border: Border.all(
-                      color: outlineColor.withValues(
-                        alpha: brightness == Brightness.dark ? 0.32 : 0.2,
+                    decoration: BoxDecoration(
+                      color: composerSurface.withValues(
+                        alpha: brightness == Brightness.dark ? 0.9 : 0.2,
                       ),
-                      width: BorderWidth.micro,
-                    ),
-                  ),
-                  child: Row(
-                    children: [
-                      Expanded(
-                        child: _buildComposerTextField(
-                          brightness: brightness,
-                          sendOnEnter: sendOnEnter,
-                          placeholderBase: placeholderBase,
-                          placeholderFocused: placeholderFocused,
-                          contentPadding: const EdgeInsets.symmetric(
-                            vertical: Spacing.xs,
-                          ),
-                          isActive: isActive,
+                      borderRadius: BorderRadius.circular(_composerRadius),
+                      border: Border.all(
+                        color: outlineColor.withValues(
+                          alpha: brightness == Brightness.dark ? 0.32 : 0.2,
                         ),
+                        width: BorderWidth.micro,
                       ),
-                      if (!_hasText && voiceAvailable && !isGenerating)
-                        _buildInlineMicIcon(voiceAvailable),
-                    ],
+                    ),
+                    child: Row(
+                      children: [
+                        Expanded(
+                          child: _buildComposerTextField(
+                            brightness: brightness,
+                            sendOnEnter: sendOnEnter,
+                            placeholderBase: placeholderBase,
+                            placeholderFocused: placeholderFocused,
+                            contentPadding: const EdgeInsets.symmetric(
+                              vertical: Spacing.xs,
+                            ),
+                            isActive: isActive,
+                          ),
+                        ),
+                        if (!_hasText && voiceAvailable && !isGenerating)
+                          _buildInlineMicIcon(voiceAvailable),
+                      ],
+                    ),
                   ),
                 ),
               ),