diff --git a/src/apps/review/src/lib/assets/icons/icon-edit-reply.svg b/src/apps/review/src/lib/assets/icons/icon-edit-reply.svg
new file mode 100644
index 000000000..b9cf53e09
--- /dev/null
+++ b/src/apps/review/src/lib/assets/icons/icon-edit-reply.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.16667 17.5C3.70833 17.5 3.31597 17.3368 2.98958 17.0104C2.66319 16.684 2.5 16.2917 2.5 15.8333V4.16667C2.5 3.70833 2.66319 3.31597 2.98958 2.98958C3.31597 2.66319 3.70833 2.5 4.16667 2.5H9.60417C9.88194 2.5 10.0903 2.58681 10.2292 2.76042C10.3681 2.93403 10.4375 3.125 10.4375 3.33333C10.4375 3.54167 10.3646 3.73264 10.2187 3.90625C10.0729 4.07986 9.86111 4.16667 9.58333 4.16667H4.16667V15.8333H15.8333V10.3958C15.8333 10.1181 15.9201 9.90972 16.0937 9.77083C16.2674 9.63194 16.4583 9.5625 16.6667 9.5625C16.875 9.5625 17.066 9.63194 17.2396 9.77083C17.4132 9.90972 17.5 10.1181 17.5 10.3958V15.8333C17.5 16.2917 17.3368 16.684 17.0104 17.0104C16.684 17.3368 16.2917 17.5 15.8333 17.5H4.16667ZM7.5 11.6667V9.64583C7.5 9.42361 7.54167 9.21181 7.625 9.01042C7.70833 8.80903 7.82639 8.63194 7.97917 8.47917L15.1458 1.3125C15.3125 1.14583 15.5 1.02083 15.7083 0.9375C15.9167 0.854167 16.125 0.8125 16.3333 0.8125C16.5556 0.8125 16.7674 0.854167 16.9687 0.9375C17.1701 1.02083 17.3542 1.14583 17.5208 1.3125L18.6875 2.5C18.8403 2.66667 18.9583 2.85069 19.0417 3.05208C19.125 3.25347 19.1667 3.45833 19.1667 3.66667C19.1667 3.875 19.1285 4.07986 19.0521 4.28125C18.9757 4.48264 18.8542 4.66667 18.6875 4.83333L11.5208 12C11.3681 12.1528 11.191 12.2743 10.9896 12.3646C10.7882 12.4549 10.5764 12.5 10.3542 12.5H8.33333C8.09722 12.5 7.89931 12.4201 7.73958 12.2604C7.57986 12.1007 7.5 11.9028 7.5 11.6667ZM9.16667 10.8333H10.3333L15.1667 6L14.5833 5.41667L13.9792 4.83333L9.16667 9.64583V10.8333Z" fill="#0D61BF"/>
+</svg>
diff --git a/src/apps/review/src/lib/assets/icons/index.ts b/src/apps/review/src/lib/assets/icons/index.ts
index d1c6b61fd..03920d463 100644
--- a/src/apps/review/src/lib/assets/icons/index.ts
+++ b/src/apps/review/src/lib/assets/icons/index.ts
@@ -20,6 +20,7 @@ import { ReactComponent as IconThumbsUp } from './icon-thumb-up.svg'
 import { ReactComponent as IconThumbsDown } from './icon-thumbs-down.svg'
 import { ReactComponent as IconThumbsUpFilled } from './icon-thumb-up-filled.svg'
 import { ReactComponent as IconThumbsDownFilled } from './icon-thumbs-down-filled.svg'
+import { ReactComponent as IconEditReply } from './icon-edit-reply.svg'
 
 export * from './editor/bold'
 export * from './editor/code'
@@ -59,6 +60,7 @@ export {
     IconThumbsDown,
     IconThumbsUpFilled,
     IconThumbsDownFilled,
+    IconEditReply,
 }
 
 export const phasesIcons = {
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackActions/AiFeedbackActions.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackActions/AiFeedbackActions.tsx
index a69c84c91..6974ffaa1 100644
--- a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackActions/AiFeedbackActions.tsx
+++ b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackActions/AiFeedbackActions.tsx
@@ -3,6 +3,7 @@ import { FC, useCallback, useContext, useEffect, useState } from 'react'
 import { mutate } from 'swr'
 
 import {
+    IconEditReply,
     IconReply,
     IconThumbsDown,
     IconThumbsDownFilled,
@@ -11,7 +12,7 @@ import {
 } from '~/apps/review/src/lib/assets/icons'
 import { ReviewAppContext } from '~/apps/review/src/lib/contexts'
 import { useReviewsContext } from '~/apps/review/src/pages/reviews/ReviewsContext'
-import { updateLikesOrDislikesOnRunItem, updateLikesOrDislikesOnRunItemComment } from '~/apps/review/src/lib/services'
+import { updateLikesOrDislikesOnRunItem, updateRunItemComment } from '~/apps/review/src/lib/services'
 import { EnvironmentConfig } from '~/config'
 import { ReviewAppContextModel, ReviewsContextModel } from '~/apps/review/src/lib/models'
 
@@ -29,6 +30,7 @@ interface AiFeedbackActionsProps {
     comment?: AiFeedbackComment
     feedback?: any
     onPressReply: () => void
+    onPressEdit?: () => void
 }
 
 export const AiFeedbackActions: FC<AiFeedbackActionsProps> = props => {
@@ -185,7 +187,7 @@ export const AiFeedbackActions: FC<AiFeedbackActionsProps> = props => {
         }
 
         try {
-            await updateLikesOrDislikesOnRunItemComment(workflowId, workflowRun.id, props.feedback.id, c.id, {
+            await updateRunItemComment(workflowId, workflowRun.id, props.feedback.id, c.id, {
                 downVote: down,
                 upVote: up,
             })
@@ -233,6 +235,19 @@ export const AiFeedbackActions: FC<AiFeedbackActionsProps> = props => {
                 <IconReply />
                 <span className={styles.count}>Reply</span>
             </button>
+
+            {
+                props.onPressEdit && (
+                    <button
+                        type='button'
+                        className={styles.actionBtn}
+                        onClick={props.onPressEdit}
+                    >
+                        <IconEditReply />
+                        <span className={styles.count}>Edit</span>
+                    </button>
+                )
+            }
         </div>
     )
 }
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx
index ad03040d7..cc73e23d8 100644
--- a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx
+++ b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackComments/AiFeedbackComment.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames'
 import moment from 'moment'
 
 import { useReviewsContext } from '~/apps/review/src/pages/reviews/ReviewsContext'
-import { createFeedbackComment } from '~/apps/review/src/lib/services'
+import { createFeedbackComment, updateRunItemComment } from '~/apps/review/src/lib/services'
 import { AiFeedbackItem, ReviewsContextModel } from '~/apps/review/src/lib/models'
 import { EnvironmentConfig } from '~/config'
 
@@ -23,12 +23,17 @@ interface AiFeedbackCommentProps {
 
 export const AiFeedbackComment: FC<AiFeedbackCommentProps> = props => {
     const { workflowId, workflowRun }: ReviewsContextModel = useReviewsContext()
+    const [editMode, setEditMode] = useState(false)
     const [showReply, setShowReply] = useState(false)
 
     const onShowReply = useCallback(() => {
         setShowReply(!showReply)
     }, [])
 
+    const onPressEdit = useCallback(() => {
+        setEditMode(true)
+    }, [])
+
     const onSubmitReply = useCallback(async (content: string, comment: AiFeedbackCommentType) => {
         await createFeedbackComment(workflowId as string, workflowRun?.id as string, props.feedback?.id, {
             content,
@@ -37,6 +42,15 @@ export const AiFeedbackComment: FC<AiFeedbackCommentProps> = props => {
         await mutate(`${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items`)
         setShowReply(false)
     }, [workflowId, workflowRun?.id, props.feedback?.id])
+
+    const onEditReply = useCallback(async (content: string, comment: AiFeedbackCommentType) => {
+        await updateRunItemComment(workflowId as string, workflowRun?.id as string, props.feedback?.id, comment.id, {
+            content,
+        })
+        await mutate(`${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${workflowRun?.id}/items`)
+        setEditMode(false)
+    }, [workflowId, workflowRun?.id, props.feedback?.id])
+
     return (
         <div
             key={props.comment.id}
@@ -62,12 +76,29 @@ export const AiFeedbackComment: FC<AiFeedbackCommentProps> = props => {
                         .format('MMM DD, hh:mm A')}
                 </span>
             </div>
-            <MarkdownReview value={props.comment.content} />
+            {
+                !editMode && <MarkdownReview value={props.comment.content} />
+            }
+            {
+                editMode && (
+                    <AiFeedbackReply
+                        id={props.comment.id}
+                        initialValue={props.comment.content}
+                        onSubmitReply={function submitReply(content: string) {
+                            return onEditReply(content, props.comment)
+                        }}
+                        onCloseReply={function closeReply() {
+                            setEditMode(false)
+                        }}
+                    />
+                )
+            }
             <AiFeedbackActions
                 feedback={props.feedback}
                 comment={props.comment}
                 actionType='comment'
                 onPressReply={onShowReply}
+                onPressEdit={onPressEdit}
             />
             {
                 showReply && (
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackReply/AiFeedbackReply.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackReply/AiFeedbackReply.tsx
index 0fa8a4485..6cdeccffa 100644
--- a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackReply/AiFeedbackReply.tsx
+++ b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedbackReply/AiFeedbackReply.tsx
@@ -5,7 +5,7 @@ import {
     UseFormReturn,
 } from 'react-hook-form'
 import { get } from 'lodash'
-import { FC, useCallback, useState } from 'react'
+import { FC, useCallback, useEffect, useState } from 'react'
 import classNames from 'classnames'
 
 import { yupResolver } from '@hookform/resolvers/yup'
@@ -17,8 +17,10 @@ import { FieldMarkdownEditor } from '../../../../FieldMarkdownEditor'
 import styles from './AiFeedbackReply.module.scss'
 
 interface AiFeedbackReplyProps {
+    id?: string
+    initialValue?: string
     onCloseReply: () => void
-    onSubmitReply: (content: string) => Promise<void>
+    onSubmitReply: (content: string, id?: string) => Promise<void>
 }
 
 export const AiFeedbackReply: FC<AiFeedbackReplyProps> = props => {
@@ -36,9 +38,15 @@ export const AiFeedbackReply: FC<AiFeedbackReplyProps> = props => {
         resolver: yupResolver(formFeedbackReplySchema),
     })
 
+    useEffect(() => {
+        if (props.initialValue) {
+            setReply(props.initialValue)
+        }
+    }, [props.initialValue])
+
     const onSubmit = useCallback(async (data: FormFeedbackReply) => {
         setSavingReply(true)
-        await props.onSubmitReply(data.reply)
+        await props.onSubmitReply(data.reply, props.id)
         setReply('')
         setSavingReply(false)
     }, [props.onSubmitReply, setReply])
@@ -80,7 +88,9 @@ export const AiFeedbackReply: FC<AiFeedbackReplyProps> = props => {
                         className='filledButton'
                         type='submit'
                     >
-                        Submit Reply
+                        {
+                            props.id ? 'Edit Reply' : 'Submit Reply'
+                        }
                     </button>
                     <button
                         type='button'
diff --git a/src/apps/review/src/lib/services/scorecards.service.ts b/src/apps/review/src/lib/services/scorecards.service.ts
index 6b1b0051d..9fb4fe234 100644
--- a/src/apps/review/src/lib/services/scorecards.service.ts
+++ b/src/apps/review/src/lib/services/scorecards.service.ts
@@ -43,14 +43,15 @@ export const updateLikesOrDislikesOnRunItem = (
     body,
 )
 
-export const updateLikesOrDislikesOnRunItemComment = (
+export const updateRunItemComment = (
     workflowId: string,
     runId: string,
     feedbackId: string,
     commentId: string,
     body: {
-        upVote: boolean
-        downVote: boolean
+        content?: string
+        upVote?: boolean
+        downVote?: boolean
     },
 ): Promise<void> => xhrPatchAsync(
     `${EnvironmentConfig.API.V6}/workflows/${workflowId}/runs/${runId}/items/${feedbackId}/comments/${commentId}`,