diff --git a/lib/Role/RoleForm/RoleForm.js b/lib/Role/RoleForm/RoleForm.js
index 6d3f77e..a5c5cd3 100644
--- a/lib/Role/RoleForm/RoleForm.js
+++ b/lib/Role/RoleForm/RoleForm.js
@@ -6,7 +6,7 @@ import {
   Accordion,
   AccordionSet,
   AccordionStatus, Button,
-  ConfirmationModal,
+  SessionConfirmationModal,
   ExpandAllButton,
   Layer,
   Pane,
@@ -216,10 +216,10 @@ export const RoleForm = ({
                   </Button>
                 )}
               ><FormattedMessage
-                id="stripes-authorization-components.applications.notAvailable"
-              />
+                  id="stripes-authorization-components.applications.notAvailable"
+                />
               </Pluggable>
-              <ConfirmationModal
+              <SessionConfirmationModal
                 id="unselect-application-confirmation-modal"
                 open={isUnselectApplicationConfirmationOpen}
                 onConfirm={() => {
@@ -238,8 +238,9 @@ export const RoleForm = ({
                   }}
                 />}
                 confirmLabel={<FormattedMessage id="stripes-core.button.continue" />}
+                sessionKey="suppress-authroles-unselect-confirmation-modal"
               />
-              <ConfirmationModal
+              <SessionConfirmationModal
                 id="unselect-capability-set-confirmation-modal"
                 open={isUnselectCapabilitySetConfirmationOpen.open}
                 onConfirm={() => {
@@ -264,6 +265,7 @@ export const RoleForm = ({
                   }}
                 />}
                 confirmLabel={<FormattedMessage id="stripes-core.button.continue" />}
+                sessionKey="suppress-authroles-unselect-confirmation-modal"
               />
 
               {!!unselectAllCapabilitiesAndSets && <Button