diff --git a/webapp/channels/src/components/drafts/draft_actions/__snapshots__/delete_draft_modal.test.tsx.snap b/webapp/channels/src/components/drafts/draft_actions/__snapshots__/delete_draft_modal.test.tsx.snap
index bcffa0da8f..9aa924493f 100644
--- a/webapp/channels/src/components/drafts/draft_actions/__snapshots__/delete_draft_modal.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/draft_actions/__snapshots__/delete_draft_modal.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`components/drafts/draft_actions/delete_draft_modal should have called o
 <GenericModal
   autoCloseOnCancelButton={true}
   autoCloseOnConfirmButton={true}
+  autoFocusConfirmButton={true}
   bodyPadding={true}
   compassDesign={true}
   confirmButtonText="Yes, delete"
@@ -46,6 +47,7 @@ exports[`components/drafts/draft_actions/delete_draft_modal should have called o
 <GenericModal
   autoCloseOnCancelButton={true}
   autoCloseOnConfirmButton={true}
+  autoFocusConfirmButton={true}
   bodyPadding={true}
   compassDesign={true}
   confirmButtonText="Yes, delete"
diff --git a/webapp/channels/src/components/drafts/draft_actions/delete_draft_modal.tsx b/webapp/channels/src/components/drafts/draft_actions/delete_draft_modal.tsx
index 607ee09c81..76bee8db7f 100644
--- a/webapp/channels/src/components/drafts/draft_actions/delete_draft_modal.tsx
+++ b/webapp/channels/src/components/drafts/draft_actions/delete_draft_modal.tsx
@@ -49,6 +49,7 @@ function DeleteDraftModal({
             onExited={onExited}
             compassDesign={true}
             isDeleteModal={true}
+            autoFocusConfirmButton={true}
         >
             {message}
         </GenericModal>