diff --git a/frontend/src/components/chat/Messages/Message/UserMessage.tsx b/frontend/src/components/chat/Messages/Message/UserMessage.tsx
index 66eceea36d..bb61ad1fd2 100644
--- a/frontend/src/components/chat/Messages/Message/UserMessage.tsx
+++ b/frontend/src/components/chat/Messages/Message/UserMessage.tsx
@@ -110,6 +110,17 @@ const UserMessage = memo(function UserMessage({
                 autoFocus
                 value={editValue}
                 onChange={(e) => setEditValue(e.target.value)}
+                onKeyDown={(e) => {
+                  if (
+                    e.key === 'Enter' &&
+                    !e.shiftKey &&
+                    !e.nativeEvent.isComposing &&
+                    !disabled
+                  ) {
+                    e.preventDefault();
+                    handleEdit();
+                  }
+                }}
                 className="mt-1 bg-transparent placeholder:text-base placeholder:font-medium text-base"
                 maxHeight={250}
               />