diff --git a/components/Blocks/BaseTextareaBlock.tsx b/components/Blocks/BaseTextareaBlock.tsx
index 15e251bd..6244bbd6 100644
--- a/components/Blocks/BaseTextareaBlock.tsx
+++ b/components/Blocks/BaseTextareaBlock.tsx
@@ -15,6 +15,7 @@ export function BaseTextareaBlock(
   return (
     <AsyncValueAutosizeTextarea
       {...passDownProps}
+      noWrap
       onKeyDown={(e) => {
         if (e.key === "ArrowUp") {
           let selection = e.currentTarget.selectionStart;
diff --git a/components/utils/AutosizeTextarea.tsx b/components/utils/AutosizeTextarea.tsx
index ec88bb4f..be6fea06 100644
--- a/components/utils/AutosizeTextarea.tsx
+++ b/components/utils/AutosizeTextarea.tsx
@@ -10,23 +10,25 @@ import styles from "./textarea-styles.module.css";
 export type AutosizeTextareaProps = React.DetailedHTMLProps<
   React.TextareaHTMLAttributes<HTMLTextAreaElement>,
   HTMLTextAreaElement
->;
+> & { noWrap?: boolean };
 export const AutosizeTextarea = forwardRef<
   HTMLTextAreaElement,
   AutosizeTextareaProps
->((props: AutosizeTextareaProps, ref) => {
+>((props: AutosizeTextareaProps & { noWrap?: boolean }, ref) => {
   let textarea = useRef<HTMLTextAreaElement | null>(null);
+  let { noWrap, ...rest } = props;
   useImperativeHandle(ref, () => textarea.current as HTMLTextAreaElement);
 
+  console.log({ noWrap });
   return (
     <div
-      className={`${styles["grow-wrap"]} ${props.className} `}
+      className={`${styles["grow-wrap"]} ${props.className} ${noWrap ? styles["no-wrap"] : ""}`}
       data-replicated-value={props.value}
       style={props.style}
     >
       <textarea
         rows={1}
-        {...props}
+        {...rest}
         ref={textarea}
         className={`placeholder:text-tertiary bg-transparent ${props.className}`}
       />
diff --git a/components/utils/textarea-styles.module.css b/components/utils/textarea-styles.module.css
index 5c11150d..e43a0035 100644
--- a/components/utils/textarea-styles.module.css
+++ b/components/utils/textarea-styles.module.css
@@ -11,7 +11,7 @@
   content: attr(data-replicated-value) " ";
 
   /* This is how textarea text behaves */
-  white-space: pre;
+  white-space: pre-wrap;
 
   /* Hidden from view, clicks, and screen readers */
   visibility: hidden;
@@ -36,3 +36,7 @@
 .grow-wrap > textarea:focus {
   outline: none;
 }
+
+.no-wrap::after {
+  white-space: pre !important;
+}