diff --git a/packages/jupyter-ai/src/components/chat-input.tsx b/packages/jupyter-ai/src/components/chat-input.tsx
index 705b57fd3..6e13b9679 100644
--- a/packages/jupyter-ai/src/components/chat-input.tsx
+++ b/packages/jupyter-ai/src/components/chat-input.tsx
@@ -280,13 +280,17 @@ export function ChatInput(props: ChatInputProps): JSX.Element {
             {...params}
             fullWidth
             variant="outlined"
+            maxRows={20}
             multiline
             placeholder="Ask Jupyternaut"
             onKeyDown={handleKeyDown}
             InputProps={{
               ...params.InputProps,
               endAdornment: (
-                <InputAdornment position="end">
+                <InputAdornment
+                  position="end"
+                  sx={{ height: 'unset', alignSelf: 'flex-end' }}
+                >
                   <SendButton {...sendButtonProps} />
                 </InputAdornment>
               )