diff --git a/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/index.jsx b/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/index.jsx
index a14b70ac8d4..f5de1ea24fa 100644
--- a/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/index.jsx
+++ b/frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/index.jsx
@@ -32,6 +32,9 @@ export default function PromptInput({
   const formRef = useRef(null);
   const textareaRef = useRef(null);
   const [_, setFocused] = useState(false);
+  const undoStack = useRef([]);
+  const redoStack = useRef([]);
+  const MAX_STACK_SIZE = 100;
 
   // To prevent too many re-renders we remotely listen for updates from the parent
   // via an event cycle. Otherwise, using message as a prop leads to a re-render every
@@ -54,6 +57,21 @@ export default function PromptInput({
     resetTextAreaHeight();
   }, [inputDisabled]);
 
+  // Save the current state before changes
+  const saveCurrentState = (adjustment = 0) => {
+    if (undoStack.current.length >= MAX_STACK_SIZE) {
+      // If the stack is at the max size, remove oldest state
+      undoStack.current.shift();
+    }
+    undoStack.current.push({
+      value: promptInput,
+      cursorPositionStart: textareaRef.current.selectionStart + adjustment,
+      cursorPositionEnd: textareaRef.current.selectionEnd + adjustment,
+    });
+  };
+
+  const debouncedSaveState = debounce(saveCurrentState, 250);
+
   const handleSubmit = (e) => {
     setFocused(false);
     submit(e);
@@ -78,10 +96,46 @@ export default function PromptInput({
     if (showAgents) return setShowAgents(false);
   };
 
-  const captureEnter = (event) => {
-    if (event.keyCode == 13) {
-      if (!event.shiftKey) {
-        submit(event);
+  const captureEnterOrUndo = (event) => {
+    if (event.keyCode === 13 && !event.shiftKey) {
+      event.preventDefault();
+      submit(event);
+    } else if ((event.ctrlKey || event.metaKey) && event.key === "z") {
+      event.preventDefault();
+      if (event.shiftKey) {
+        // Redo with Ctrl+Shift+Z or Cmd+Shift+Z
+        if (redoStack.current.length > 0) {
+          const nextState = redoStack.current.pop();
+          undoStack.current.push({
+            value: promptInput,
+            cursorPositionStart: textareaRef.current.selectionStart,
+            cursorPositionEnd: textareaRef.current.selectionEnd,
+          });
+          setPromptInput(nextState.value);
+          setTimeout(() => {
+            textareaRef.current.setSelectionRange(
+              nextState.cursorPositionStart,
+              nextState.cursorPositionEnd
+            );
+          }, 0);
+        }
+      } else {
+        // Undo with Ctrl+Z or Cmd+Z
+        if (undoStack.current.length > 0) {
+          const lastState = undoStack.current.pop();
+          redoStack.current.push({
+            value: promptInput,
+            cursorPositionStart: textareaRef.current.selectionStart,
+            cursorPositionEnd: textareaRef.current.selectionEnd,
+          });
+          setPromptInput(lastState.value);
+          setTimeout(() => {
+            textareaRef.current.setSelectionRange(
+              lastState.cursorPositionStart,
+              lastState.cursorPositionEnd
+            );
+          }, 0);
+        }
       }
     }
   };
@@ -145,6 +199,15 @@ export default function PromptInput({
   const watchForSlash = debounce(checkForSlash, 300);
   const watchForAt = debounce(checkForAt, 300);
 
+  const handleChange = (e) => {
+    debouncedSaveState(-1);
+    onChange(e);
+    watchForSlash(e);
+    watchForAt(e);
+    adjustTextArea(e);
+    setPromptInput(e.target.value);
+  };
+
   return (
     <div className="w-full fixed md:absolute bottom-0 left-0 z-10 md:z-0 flex justify-center items-center">
       <SlashCommands
@@ -168,15 +231,12 @@ export default function PromptInput({
             <div className="flex items-center w-full border-b-2 border-gray-500/50">
               <textarea
                 ref={textareaRef}
-                onChange={(e) => {
-                  onChange(e);
-                  watchForSlash(e);
-                  watchForAt(e);
-                  adjustTextArea(e);
-                  setPromptInput(e.target.value);
+                onChange={handleChange}
+                onKeyDown={captureEnterOrUndo}
+                onPaste={(e) => {
+                  saveCurrentState();
+                  handlePasteEvent(e);
                 }}
-                onKeyDown={captureEnter}
-                onPaste={handlePasteEvent}
                 required={true}
                 disabled={inputDisabled}
                 onFocus={() => setFocused(true)}