diff --git a/api/src/controllers/reviews.ts b/api/src/controllers/reviews.ts
index 17e30641..2e9cd840 100644
--- a/api/src/controllers/reviews.ts
+++ b/api/src/controllers/reviews.ts
@@ -293,5 +293,28 @@ router.delete('/clear', async function (req, res) {
     res.json({ error: 'Can only clear on development environment' });
   }
 });
+/**
+ * Updating the review
+ */
+router.patch('/updateReview', async function (req, res) {
+  if (req.session.passport) {
+    const updatedReviewBody = req.body;
+
+    const query = {
+      _id: new ObjectId(req.body._id),
+    };
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { _id, ...updateWithoutId } = updatedReviewBody;
+    await updateDocument(COLLECTION_NAMES.REVIEWS, query, { $set: updateWithoutId });
+    const responseWithId = {
+      _id: query._id,
+      ...updateWithoutId,
+    };
+
+    res.json(responseWithId);
+  } else {
+    res.status(401).json({ error: 'Must be logged in to update a review.' });
+  }
+});
 
 export default router;
diff --git a/site/src/component/Review/Review.scss b/site/src/component/Review/Review.scss
index 16ff812c..1ada20b7 100644
--- a/site/src/component/Review/Review.scss
+++ b/site/src/component/Review/Review.scss
@@ -212,3 +212,20 @@
     }
   }
 }
+
+/* Edit review icon */
+.edit-pen-icon {
+  float: right;
+  font-size: 1.5rem;
+  width: 3rem;
+  text-align: center;
+  padding: 0.1rem;
+  border-radius: 55%;
+}
+
+.edit-pen-icon:hover {
+  transform: scale(1.1);
+  transition: transform 0.3s ease;
+  background: var(--peterportal-mid-gray);
+  color: white;
+}
diff --git a/site/src/component/Review/SubReview.tsx b/site/src/component/Review/SubReview.tsx
index 4bcb9e6a..5b4aa8e1 100644
--- a/site/src/component/Review/SubReview.tsx
+++ b/site/src/component/Review/SubReview.tsx
@@ -9,6 +9,7 @@ import { Link } from 'react-router-dom';
 import { PersonFill } from 'react-bootstrap-icons';
 import { ReviewData, VoteRequest, CourseGQLData, ProfessorGQLData, VoteColor } from '../../types/types';
 import ReportForm from '../ReportForm/ReportForm';
+import { FaPen } from 'react-icons/fa';
 
 interface SubReviewProps {
   review: ReviewData;
@@ -16,11 +17,15 @@ interface SubReviewProps {
   professor?: ProfessorGQLData;
   colors?: VoteColor;
   colorUpdater?: () => void;
+  editable?: boolean;
+  editReview?: (review: ReviewData, course?: CourseGQLData, professor?: ProfessorGQLData) => void;
 }
 
-const SubReview: FC<SubReviewProps> = ({ review, course, professor, colors, colorUpdater }) => {
+const SubReview: FC<SubReviewProps> = ({ review, course, professor, colors, colorUpdater, editable, editReview }) => {
   const [score, setScore] = useState(review.score);
   const [cookies] = useCookies(['user']);
+
+  //Edit Review
   let upvoteClass;
   let downvoteClass;
   if (colors != undefined && colors.colors != undefined) {
@@ -91,6 +96,11 @@ const SubReview: FC<SubReviewProps> = ({ review, course, professor, colors, colo
 
   return (
     <div className="subreview">
+      {editable && editReview && (
+        <div className="edit-pen-icon" onClick={() => editReview(review, course, professor)}>
+          <FaPen />
+        </div>
+      )}
       <div>
         <h3 className="subreview-identifier">
           {professor && (
diff --git a/site/src/component/ReviewForm/ReviewForm.tsx b/site/src/component/ReviewForm/ReviewForm.tsx
index 1f679800..0a85fdab 100644
--- a/site/src/component/ReviewForm/ReviewForm.tsx
+++ b/site/src/component/ReviewForm/ReviewForm.tsx
@@ -11,7 +11,6 @@ import Button from 'react-bootstrap/Button';
 import RangeSlider from 'react-bootstrap-range-slider';
 import Modal from 'react-bootstrap/Modal';
 import ReCAPTCHA from 'react-google-recaptcha';
-
 import { addReview } from '../../store/slices/reviewSlice';
 import { useAppDispatch, useAppSelector } from '../../store/hooks';
 import { ReviewProps } from '../Review/Review';
@@ -21,6 +20,8 @@ import { quarterNames } from '../../helpers/planner';
 
 interface ReviewFormProps extends ReviewProps {
   closeForm: () => void;
+  editable?: boolean;
+  review?: ReviewData;
 }
 
 const ReviewForm: FC<ReviewFormProps> = (props) => {
@@ -44,7 +45,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
     'Group projects',
     'Gives good feedback',
   ];
-
+  const [reviewId, setReviewId] = useState<string | undefined>(props.review?._id); //edit review
   const [professor, setProfessor] = useState(props.professor?.ucinetid || '');
   const [course, setCourse] = useState(props.course?.id || '');
   const [yearTaken, setYearTaken] = useState('');
@@ -82,19 +83,48 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
       if (cookies.user === undefined) {
         alert('You must be logged in to add a review!');
         props.closeForm();
+      } else {
+        setSubmitted(false);
       }
     }
-  }, [showForm, props, cookies]);
+    //If editable is true
+    if (props.review) {
+      const [year, quarter] = props.review.quarter.split(' ');
+      setReviewId(props.review?._id);
+      setQuarterTaken(quarter);
+      setYearTaken(year);
+      setGradeReceived(props.review.gradeReceived);
+      setDifficulty(props.review.difficulty);
+      setQuality(props.review.rating);
+      setContent(props.review?.reviewContent);
+      setSelectedTags(props.review?.tags);
+      setAttendance(props.review?.attendance);
+      setTakeAgain(props.review?.takeAgain);
+      setTextbook(props.review?.textbook);
+      setUserName(props.review?.userDisplay);
+      setProfessor(props.review?.professorID);
+      setCourse(props.review?.courseID);
+    }
+  }, [showForm]);
 
   const postReview = async (review: ReviewData) => {
-    const res = await axios.post<ReviewData>('/api/reviews', review).catch((err) => err.response);
-    if (res.status === 400) {
-      alert(res.data.error ?? 'You have already submitted a review for this course/professor');
-    } else if (res.data.error !== undefined) {
-      alert('You must be logged in to add a review!');
+    if (props.editable) {
+      const res = await axios.patch('/api/reviews/updateReview', review);
+      if (res.data.hasOwnProperty.call(res.data, 'error')) {
+        alert('You must be logged in to edit the review!');
+      } else {
+        setSubmitted(true);
+      }
     } else {
-      setSubmitted(true);
-      dispatch(addReview(res.data));
+      const res = await axios.post<ReviewData>('/api/reviews', review).catch((err) => err.response);
+      if (res.status === 400) {
+        alert(res.data.error ?? 'You have already submitted a review for this course/professor');
+      } else if (res.data.error !== undefined) {
+        alert('You must be logged in to add a review!');
+      } else {
+        setSubmitted(true);
+        dispatch(addReview(res.data));
+      }
     }
   };
 
@@ -116,35 +146,69 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
       alert('Please complete the CAPTCHA');
       return;
     }
-
-    const date = new Date();
-    const year = date.getFullYear();
-    const month = (1 + date.getMonth()).toString();
-    const day = date.getDate().toString();
-    const review = {
-      professorID: professor,
-      courseID: course,
-      userID: userID,
-      userDisplay: userName,
-      reviewContent: content,
-      rating: quality,
-      difficulty: difficulty,
-      timestamp: month + '/' + day + '/' + year,
-      gradeReceived: gradeReceived,
-      forCredit: true,
-      quarter: yearTaken + ' ' + quarterTaken,
-      score: 0,
-      takeAgain: takeAgain,
-      textbook: textbook,
-      attendance: attendance,
-      tags: selectedTags,
-      captchaToken: captchaToken,
-    };
-    if (content.length > 500) {
-      setOverCharLimit(true);
+    if (props.editable === false) {
+      const date = new Date();
+      const year = date.getFullYear();
+      const month = (1 + date.getMonth()).toString();
+      const day = date.getDate().toString();
+      const review = {
+        professorID: professor,
+        courseID: course,
+        userID: userID,
+        userDisplay: userName,
+        reviewContent: content,
+        rating: quality,
+        difficulty: difficulty,
+        timestamp: month + '/' + day + '/' + year,
+        gradeReceived: gradeReceived,
+        forCredit: true,
+        quarter: yearTaken + ' ' + quarterTaken,
+        score: 0,
+        takeAgain: takeAgain,
+        textbook: textbook,
+        attendance: attendance,
+        tags: selectedTags,
+        captchaToken: captchaToken,
+      };
+      if (content.length > 500) {
+        setOverCharLimit(true);
+      } else {
+        setOverCharLimit(false);
+        postReview(review);
+      }
     } else {
-      setOverCharLimit(false);
-      postReview(review);
+      const date = new Date();
+      const year = date.getFullYear();
+      const month = (1 + date.getMonth()).toString();
+      const day = date.getDate().toString();
+      const review = {
+        _id: reviewId,
+        professorID: professor,
+        courseID: course,
+        userID: userID,
+        userDisplay: userName,
+        reviewContent: content,
+        rating: quality,
+        difficulty: difficulty,
+        timestamp: month + '/' + day + '/' + year,
+        gradeReceived: gradeReceived,
+        forCredit: true,
+        quarter: yearTaken + ' ' + quarterTaken,
+        score: 0,
+        takeAgain: takeAgain,
+        textbook: textbook,
+        attendance: attendance,
+        tags: selectedTags,
+        verified: false,
+        captchaToken: captchaToken,
+      };
+      if (content.length > 500) {
+        setOverCharLimit(true);
+      } else {
+        setOverCharLimit(false);
+        postReview(review);
+        setSubmitted(true);
+      }
     }
   };
 
@@ -234,10 +298,14 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
         <Col>
           <Row>
             <Col>
-              <h1>
-                It's your turn to review{' '}
-                {props.course ? props.course?.department + ' ' + props.course?.courseNumber : props.professor?.name}
-              </h1>
+              {props.editable ? (
+                <h1>Edit your review for {props.review?.courseID + ' ' + props.review?.professorID}</h1>
+              ) : (
+                <h1>
+                  It's your turn to review{' '}
+                  {props.course ? props.course?.department + ' ' + props.course?.courseNumber : props.professor?.name}
+                </h1>
+              )}
             </Col>
           </Row>
           <Row className="mt-4" lg={2} md={1}>
@@ -254,6 +322,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                     defaultValue=""
                     required
                     onChange={(e) => setGradeReceived(e.target.value)}
+                    value={gradeReceived}
                   >
                     <option disabled={true} value="">
                       Grade
@@ -278,6 +347,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                       defaultValue=""
                       required
                       onChange={(e) => setQuarterTaken(e.target.value)}
+                      value={quarterTaken}
                     >
                       <option disabled={true} value="">
                         Quarter
@@ -296,6 +366,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                       defaultValue=""
                       required
                       onChange={(e) => setYearTaken(e.target.value)}
+                      value={yearTaken}
                     >
                       <option disabled={true} value="">
                         Year
@@ -349,6 +420,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                       id="takeAgain"
                       label="Would Take Again"
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTakeAgain(e.target.checked)}
+                      checked={takeAgain}
                     />
                     <Form.Check
                       inline
@@ -356,6 +428,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                       id="textbook"
                       label="Use Textbook"
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTextbook(e.target.checked)}
+                      checked={textbook}
                     />
                     <Form.Check
                       inline
@@ -363,6 +436,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                       id="attendance"
                       label="Mandatory Attendance"
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) => setAttendance(e.target.checked)}
+                      checked={attendance}
                     />
                   </Col>
                 </Row>
@@ -407,6 +481,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                       setOverCharLimit(false);
                     }
                   }}
+                  value={props.editable ? content : props.review?.reviewContent}
                 />
                 {/* <textarea rows={5} /> */}
                 <div className="char-limit">
@@ -444,6 +519,7 @@ const ReviewForm: FC<ReviewFormProps> = (props) => {
                           setUserName(cookies.user.name);
                         }
                       }}
+                      checked={userName === 'Anonymous Peter'}
                     />
                   </Col>
                 </Row>
diff --git a/site/src/component/UserReviews/UserReviews.scss b/site/src/component/UserReviews/UserReviews.scss
index aa84a6d7..b37db357 100644
--- a/site/src/component/UserReviews/UserReviews.scss
+++ b/site/src/component/UserReviews/UserReviews.scss
@@ -14,3 +14,8 @@
     align-items: flex-end;
   }
 }
+
+//Delete modal
+.delete-review-modal {
+  text-align: center !important;
+}
diff --git a/site/src/component/UserReviews/UserReviews.tsx b/site/src/component/UserReviews/UserReviews.tsx
index 16221ffd..c5e77f85 100644
--- a/site/src/component/UserReviews/UserReviews.tsx
+++ b/site/src/component/UserReviews/UserReviews.tsx
@@ -3,14 +3,29 @@ import { FC, useEffect, useState } from 'react';
 import SubReview from '../../component/Review/SubReview';
 import Button from 'react-bootstrap/Button';
 import { Divider } from 'semantic-ui-react';
-import { ReviewData } from '../../../src/types/types';
+import { CourseGQLData, ProfessorGQLData, ReviewData } from '../../../src/types/types';
 import './UserReviews.scss';
 import { useCookies } from 'react-cookie';
+import { useAppDispatch } from '../../store/hooks';
+import { setFormStatus } from '../../store/slices/reviewSlice';
+import ReviewForm from '../ReviewForm/ReviewForm';
+import Modal from 'react-bootstrap/Modal';
 
 const UserReviews: FC = () => {
   const [reviews, setReviews] = useState<ReviewData[]>([]);
   const [loaded, setLoaded] = useState<boolean>(false);
   const [cookies] = useCookies(['user']);
+  //edit review states
+  const [professorData] = useState<Map<string, ProfessorGQLData>>(new Map());
+  const [courseData] = useState<Map<string, CourseGQLData>>(new Map());
+  const [courseToEdit, setCourseToEdit] = useState<CourseGQLData>();
+  const [professorToEdit, setProfessorToEdit] = useState<ProfessorGQLData>();
+  const [reviewToEdit, setReviewToEdit] = useState<ReviewData>();
+  const dispatch = useAppDispatch();
+  //delete review
+  const [show, setShow] = useState(false);
+  const handleClose = () => setShow(false);
+  const handleShow = () => setShow(true);
 
   const getUserReviews = async () => {
     const response: AxiosResponse<ReviewData[]> = await axios.get(`/api/reviews?userID=${cookies.user.id}`);
@@ -22,9 +37,32 @@ const UserReviews: FC = () => {
     getUserReviews();
   }, []);
 
+  //Delete Review
   const deleteReview = async (reviewID: string) => {
     await axios.delete('/api/reviews', { data: { id: reviewID } });
     setReviews(reviews.filter((review) => review._id !== reviewID));
+    handleClose();
+  };
+
+  //Edit Review
+  const editReview = (review: ReviewData, course?: CourseGQLData, professor?: ProfessorGQLData) => {
+    setCourseToEdit(course);
+    setProfessorToEdit(professor);
+    setReviewToEdit(review);
+    console.log('Data received from SubReview:', {
+      course,
+      professor,
+      review,
+    });
+    dispatch(setFormStatus(true));
+    document.body.style.overflow = 'hidden';
+    console.log('Edit Review clicked!');
+  };
+
+  const closeForm = async () => {
+    dispatch(setFormStatus(false));
+    document.body.style.overflow = 'visible';
+    await getUserReviews();
   };
 
   if (!loaded) {
@@ -39,14 +77,45 @@ const UserReviews: FC = () => {
         {reviews.map((review, i) => (
           <div key={`user-reviews-${i}`} className="user-reviews">
             <Divider />
-            <SubReview review={review}></SubReview>
+            <SubReview
+              review={review}
+              course={courseData.get(review.courseID)}
+              professor={professorData.get(review.professorID)}
+              editable={true}
+              editReview={editReview}
+            />
             <div className="user-reviews-footer">
-              <Button variant="danger" className="mr-3" onClick={() => deleteReview(review._id!)}>
-                Delete
-              </Button>
+              <div className="delete-review-dialog">
+                <Button variant="danger" className="mr-3" onClick={handleShow}>
+                  Delete
+                </Button>
+                <Modal show={show} onHide={handleClose} backdrop="static" keyboard={true} centered autoFocus>
+                  <Modal.Header closeButton>
+                    <Modal.Title>Delete Review Confirmation</Modal.Title>
+                  </Modal.Header>
+                  <Modal.Body>
+                    Deleting a review will remove it permanently. Are you sure you want to proceed?
+                  </Modal.Body>
+                  <Modal.Footer>
+                    <Button variant="secondary" onClick={handleClose}>
+                      Close
+                    </Button>
+                    <Button variant="danger" onClick={() => deleteReview(review._id!)}>
+                      Delete
+                    </Button>
+                  </Modal.Footer>
+                </Modal>
+              </div>
             </div>
           </div>
         ))}
+        <ReviewForm
+          course={courseToEdit}
+          professor={professorToEdit}
+          review={reviewToEdit}
+          closeForm={closeForm}
+          editable={true}
+        />
       </div>
     );
   }