diff --git a/src/shared/components/modal/modal.tsx b/src/shared/components/modal/modal.tsx
index 9092e91f3..c7ccec9e9 100644
--- a/src/shared/components/modal/modal.tsx
+++ b/src/shared/components/modal/modal.tsx
@@ -106,10 +106,16 @@ export const ConfirmModal = ({
         <Stack>
             <Flex>{children}</Flex>
             <Group justify="flex-end">
-                <Button data-focus onClick={handleCancel} variant="default">
+                <Button onClick={handleCancel} variant="default">
                     {labels?.cancel ? labels.cancel : 'Cancel'}
                 </Button>
-                <Button disabled={disabled} loading={loading} onClick={onConfirm} variant="filled">
+                <Button
+                    data-autofocus
+                    disabled={disabled}
+                    loading={loading}
+                    onClick={onConfirm}
+                    variant="filled"
+                >
                     {labels?.confirm ? labels.confirm : 'Confirm'}
                 </Button>
             </Group>