diff --git a/web/src/components/Changes/Changes.tsx b/web/src/components/Changes/Changes.tsx
index 510253aab..27556b13f 100644
--- a/web/src/components/Changes/Changes.tsx
+++ b/web/src/components/Changes/Changes.tsx
@@ -195,7 +195,7 @@ export const Changes: React.FC<ChangesProps> = ({
                   <ReviewDecisionButton
                     repoMetadata={repoMetadata}
                     pullRequestMetadata={pullRequestMetadata}
-                    shouldHide={readOnly || pullRequestMetadata?.state === 'merged'}
+                    shouldHide={readOnly || pullRequestMetadata?.state === 'merged' || !!pullRequestMetadata?.is_draft}
                   />
                 </Layout.Horizontal>
               </Container>
diff --git a/web/src/components/DiffViewer/DiffViewer.tsx b/web/src/components/DiffViewer/DiffViewer.tsx
index feeda98dd..c1ded7f02 100644
--- a/web/src/components/DiffViewer/DiffViewer.tsx
+++ b/web/src/components/DiffViewer/DiffViewer.tsx
@@ -414,7 +414,8 @@ export const DiffViewer: React.FC<DiffViewerProps> = ({
       showError,
       updateComment,
       deleteComment,
-      confirmAct
+      confirmAct,
+      onCommentUpdate
     ]
   )