diff --git a/components/character/CharacterConflictModal/index.tsx b/components/character/CharacterConflictModal/index.tsx
index d89a0dca..5306fe39 100644
--- a/components/character/CharacterConflictModal/index.tsx
+++ b/components/character/CharacterConflictModal/index.tsx
@@ -111,10 +111,16 @@ const CharacterConflictModal = (props: Props) => {
         </div>
         <DialogFooter
           rightElements={[
-            <Button bound={true} onClick={close} text={t('buttons.cancel')} />,
+            <Button
+              bound={true}
+              onClick={close}
+              key="cancel"
+              text={t('buttons.cancel')}
+            />,
             <Button
               bound={true}
               onClick={props.resolveConflict}
+              key="confirm"
               text={t('modals.conflict.buttons.confirm')}
             />,
           ]}
diff --git a/components/weapon/WeaponConflictModal/index.tsx b/components/weapon/WeaponConflictModal/index.tsx
index d9cebe7f..081c69d2 100644
--- a/components/weapon/WeaponConflictModal/index.tsx
+++ b/components/weapon/WeaponConflictModal/index.tsx
@@ -103,9 +103,15 @@ const WeaponConflictModal = (props: Props) => {
         </div>
         <DialogFooter
           rightElements={[
-            <Button bound={true} onClick={close} text={t('buttons.cancel')} />,
             <Button
               bound={true}
+              onClick={close}
+              key="cancel"
+              text={t('buttons.cancel')}
+            />,
+            <Button
+              bound={true}
+              key="confirm"
               onClick={props.resolveConflict}
               text={t('modals.conflict.buttons.confirm')}
             />,