diff --git a/ondeck/src/app/(dashboard)/tasks/assign/page-client.tsx b/ondeck/src/app/(dashboard)/tasks/assign/page-client.tsx
index 2c065a5..4091e70 100644
--- a/ondeck/src/app/(dashboard)/tasks/assign/page-client.tsx
+++ b/ondeck/src/app/(dashboard)/tasks/assign/page-client.tsx
@@ -329,7 +329,11 @@ export function BulkAssignClient({ users, clients, designations }: BulkAssignCli
       </Card>
 
       <AlertDialog open={!!preview} onOpenChange={(open) => { if (!open) setPreview(null) }}>
-        <AlertDialogContent>
+        <AlertDialogContent
+          onEscapeKeyDown={(event) => {
+            if (generating) event.preventDefault()
+          }}
+        >
           <AlertDialogHeader>
             <AlertDialogTitle>
               Generate {preview?.totalEstimatedTasks} task{preview && preview.totalEstimatedTasks !== 1 ? 's' : ''}?
@@ -358,7 +362,7 @@ export function BulkAssignClient({ users, clients, designations }: BulkAssignCli
             </Table>
           </div>
           <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
+            <AlertDialogCancel disabled={generating}>Cancel</AlertDialogCancel>
             <AlertDialogAction onClick={handleConfirmGenerate} disabled={generating}>
               {generating ? 'Generating...' : 'Confirm'}
             </AlertDialogAction>