diff --git a/packages/synapse-react-client/src/components/AccessRequirementList/AccessRequirementList.tsx b/packages/synapse-react-client/src/components/AccessRequirementList/AccessRequirementList.tsx
index ea40254f61..961384b0e8 100644
--- a/packages/synapse-react-client/src/components/AccessRequirementList/AccessRequirementList.tsx
+++ b/packages/synapse-react-client/src/components/AccessRequirementList/AccessRequirementList.tsx
@@ -16,7 +16,16 @@ import CancelRequestDataAccess from './ManagedACTAccessRequirementRequestFlow/Ca
 import ResearchProjectForm from './ManagedACTAccessRequirementRequestFlow/ResearchProjectForm/ResearchProjectForm'
 import DataAccessRequestAccessorsFilesForm from './ManagedACTAccessRequirementRequestFlow/DataAccessRequestAccessorsFilesForm/DataAccessRequestAccessorsFilesForm'
 import RequestDataAccessSuccess from './ManagedACTAccessRequirementRequestFlow/RequestDataAccessSuccess'
-import { Box, Button, styled, Typography, TypographyProps } from '@mui/material'
+import {
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  styled,
+  Typography,
+  TypographyProps,
+} from '@mui/material'
 import AuthenticatedRequirement from './RequirementItem/AuthenticatedRequirement'
 import CertificationRequirement from './RequirementItem/CertificationRequirement'
 import ValidationRequirement from './RequirementItem/ValidationRequirement'
@@ -31,7 +40,7 @@ import { AccessRequirementListItem } from './AccessRequirementListItem'
 import { useSynapseContext } from '../../utils'
 import { useCanShowManagedACTWikiInWizard } from './AccessRequirementListUtils'
 import { noop } from 'lodash-es'
-import { DialogBase } from '../DialogBase'
+import { DialogBaseTitle } from '../DialogBase'
 import UserOrTeamBadge from '../UserOrTeamBadge'
 import { EntityLink } from '../EntityLink'
 
@@ -48,6 +57,8 @@ export type AccessRequirementListProps = {
   onHide: () => void
   /* Displays the provided list of access requirements, instead of the ones fetched using the subject ID */
   accessRequirementFromProps?: Array<AccessRequirement>
+  /* If provided, displays these actions on when viewing all ARs */
+  customDialogActions?: React.ReactNode
 } & (
   | {
       /**
@@ -143,6 +154,7 @@ export default function AccessRequirementList(
     renderAsModal = false,
     numberOfFilesAffected,
     requestObjectName,
+    customDialogActions,
   } = props
 
   const isShowingRequirementsForEntity = 'entityId' in props
@@ -279,44 +291,6 @@ export default function AccessRequirementList(
     }
   }, [numberOfFilesAffected, requestObjectName, subjectId, subjectType])
 
-  const content = (
-    <>
-      <DialogSubsectionHeader sx={{ mt: 0 }}>
-        What is this request for?
-      </DialogSubsectionHeader>
-      <Typography variant={'body1'} component={'span'}>
-        {requestDetails}
-      </Typography>
-      <DialogSubsectionHeader>What do I need to do?</DialogSubsectionHeader>
-      <AuthenticatedRequirement />
-      {anyARsRequireCertification && <CertificationRequirement />}
-      {anyARsRequireProfileValidation && <ValidationRequirement />}
-      {anyARsRequireTwoFactorAuth && <TwoFactorAuthEnabledRequirement />}
-      {sortedAccessRequirementIds
-        ?.map(id => accessRequirements!.find(ar => id === String(ar.id))!)
-        ?.map(accessRequirement => {
-          return (
-            <AccessRequirementListItem
-              key={accessRequirement.id}
-              accessRequirement={accessRequirement}
-              subjectId={subjectId}
-              subjectType={subjectType}
-              onHide={onHide}
-              onRequestAccess={accessRequirement => {
-                const nextStep = isSignedIn
-                  ? RequestDataStep.UPDATE_RESEARCH_PROJECT
-                  : RequestDataStep.PROMPT_LOGIN
-                requestDataStepCallback({
-                  managedACTAccessRequirement: accessRequirement,
-                  step: nextStep,
-                })
-              }}
-            />
-          )
-        })}
-    </>
-  )
-
   const dialogWidth =
     [
       RequestDataStep.UPDATE_ACCESSORS_AND_FILES,
@@ -325,88 +299,131 @@ export default function AccessRequirementList(
       ? 'xl'
       : 'md'
 
-  let renderContent = content
-  let dialogActions = <></>
-  if (renderAsModal) {
-    switch (requestDataStep) {
-      case RequestDataStep.UPDATE_RESEARCH_PROJECT:
-        renderContent = (
-          <ResearchProjectForm
-            managedACTAccessRequirement={managedACTAccessRequirement!}
-            onSave={researchProject => {
-              requestDataStepCallback({
-                managedACTAccessRequirement,
-                step: RequestDataStep.UPDATE_ACCESSORS_AND_FILES,
-                researchProjectId: researchProject.id,
-              })
-            }}
-            onHide={onHide}
-          />
-        )
-        break
-      case RequestDataStep.UPDATE_ACCESSORS_AND_FILES:
-        renderContent = (
-          <DataAccessRequestAccessorsFilesForm
-            researchProjectId={researchProjectId}
-            managedACTAccessRequirement={managedACTAccessRequirement!}
-            subjectId={subjectId ?? ''}
-            subjectType={subjectType ?? RestrictableObjectType.ENTITY}
-            onHide={onHide}
-            onCancel={dataAccessRequestInProgress => {
-              requestDataStepCallback({
-                step: RequestDataStep.PROMPT_CANCEL,
-                dataAccessRequest: dataAccessRequestInProgress,
-              })
-            }}
-            onSubmissionCreated={() => {
-              requestDataStepCallback({ step: RequestDataStep.COMPLETE })
-            }}
-          />
-        )
-        break
-      case RequestDataStep.PROMPT_CANCEL:
-        renderContent = (
-          <CancelRequestDataAccess
-            modifiedDataAccessRequest={dataAccessRequest}
-            onHide={onHide} // for closing dialogs
-          />
-        )
-        break
-      case RequestDataStep.PROMPT_LOGIN:
-        dialogTitle = 'Please Log In'
-        renderContent = (
-          <Box className={'AccessRequirementList login-modal '}>
+  let renderContent = <></>
+  switch (requestDataStep) {
+    case RequestDataStep.UPDATE_RESEARCH_PROJECT:
+      renderContent = (
+        <ResearchProjectForm
+          managedACTAccessRequirement={managedACTAccessRequirement!}
+          onSave={researchProject => {
+            requestDataStepCallback({
+              managedACTAccessRequirement,
+              step: RequestDataStep.UPDATE_ACCESSORS_AND_FILES,
+              researchProjectId: researchProject.id,
+            })
+          }}
+          onHide={onHide}
+        />
+      )
+      break
+    case RequestDataStep.UPDATE_ACCESSORS_AND_FILES:
+      renderContent = (
+        <DataAccessRequestAccessorsFilesForm
+          researchProjectId={researchProjectId}
+          managedACTAccessRequirement={managedACTAccessRequirement!}
+          subjectId={subjectId ?? ''}
+          subjectType={subjectType ?? RestrictableObjectType.ENTITY}
+          onHide={onHide}
+          onCancel={dataAccessRequestInProgress => {
+            requestDataStepCallback({
+              step: RequestDataStep.PROMPT_CANCEL,
+              dataAccessRequest: dataAccessRequestInProgress,
+            })
+          }}
+          onSubmissionCreated={() => {
+            requestDataStepCallback({ step: RequestDataStep.COMPLETE })
+          }}
+        />
+      )
+      break
+    case RequestDataStep.PROMPT_CANCEL:
+      renderContent = (
+        <CancelRequestDataAccess
+          modifiedDataAccessRequest={dataAccessRequest}
+          onHide={onHide} // for closing dialogs
+        />
+      )
+      break
+    case RequestDataStep.PROMPT_LOGIN:
+      dialogTitle = 'Please Log In'
+      renderContent = (
+        <>
+          <DialogBaseTitle title={dialogTitle} onCancel={onHide} />
+          <DialogContent className={'AccessRequirementList login-modal '}>
             <StandaloneLoginForm
               sessionCallback={() => {
                 window.location.reload()
               }}
             />
-          </Box>
-        )
-        break
-      case RequestDataStep.COMPLETE:
-        renderContent = <RequestDataAccessSuccess onHide={onHide} />
-        break
-      case RequestDataStep.SHOW_ALL_ARS:
-      default:
-        renderContent = content
-        dialogActions = (
-          <Button variant="contained" onClick={onHide}>
-            Close
-          </Button>
-        )
-    }
+          </DialogContent>
+        </>
+      )
+      break
+    case RequestDataStep.COMPLETE:
+      renderContent = <RequestDataAccessSuccess onHide={onHide} />
+      break
+    case RequestDataStep.SHOW_ALL_ARS:
+    default:
+      renderContent = (
+        <>
+          <DialogBaseTitle title={dialogTitle} onCancel={onHide} />
+          <DialogContent>
+            <DialogSubsectionHeader sx={{ mt: 0 }}>
+              What is this request for?
+            </DialogSubsectionHeader>
+            <Typography variant={'body1'} component={'span'}>
+              {requestDetails}
+            </Typography>
+            <DialogSubsectionHeader>
+              What do I need to do?
+            </DialogSubsectionHeader>
+            <AuthenticatedRequirement />
+            {anyARsRequireCertification && <CertificationRequirement />}
+            {anyARsRequireProfileValidation && <ValidationRequirement />}
+            {anyARsRequireTwoFactorAuth && <TwoFactorAuthEnabledRequirement />}
+            {sortedAccessRequirementIds
+              ?.map(id => accessRequirements!.find(ar => id === String(ar.id))!)
+              ?.map(accessRequirement => {
+                return (
+                  <AccessRequirementListItem
+                    key={accessRequirement.id}
+                    accessRequirement={accessRequirement}
+                    subjectId={subjectId}
+                    subjectType={subjectType}
+                    onHide={onHide}
+                    onRequestAccess={accessRequirement => {
+                      const nextStep = isSignedIn
+                        ? RequestDataStep.UPDATE_RESEARCH_PROJECT
+                        : RequestDataStep.PROMPT_LOGIN
+                      requestDataStepCallback({
+                        managedACTAccessRequirement: accessRequirement,
+                        step: nextStep,
+                      })
+                    }}
+                  />
+                )
+              })}
+          </DialogContent>
+          <DialogActions>
+            {customDialogActions ? (
+              customDialogActions
+            ) : (
+              <Button variant="contained" onClick={onHide}>
+                Close
+              </Button>
+            )}
+          </DialogActions>
+        </>
+      )
+  }
+
+  if (renderAsModal) {
     return (
-      <DialogBase
-        title={dialogTitle}
-        maxWidth={dialogWidth}
-        fullWidth
-        open={true}
-        onCancel={onHide}
-        content={renderContent}
-        actions={dialogActions}
-      />
+      <Dialog maxWidth={dialogWidth} fullWidth open={true} onClose={onHide}>
+        {renderContent}
+      </Dialog>
     )
   }
+
   return <Box>{renderContent}</Box>
 }
diff --git a/packages/synapse-react-client/src/components/ChallengeRequirementsModal/ChallengeRequirementsModal.tsx b/packages/synapse-react-client/src/components/ChallengeRequirementsModal/ChallengeRequirementsModal.tsx
index f7b83c8bcb..8214c8b984 100644
--- a/packages/synapse-react-client/src/components/ChallengeRequirementsModal/ChallengeRequirementsModal.tsx
+++ b/packages/synapse-react-client/src/components/ChallengeRequirementsModal/ChallengeRequirementsModal.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback } from 'react'
-import { ConfirmationDialog } from '../ConfirmationDialog'
 import {
   useGetAccessRequirementsForTeam,
   useGetAccessRequirementStatuses,
@@ -15,7 +14,7 @@ import { SynapseClientError, useSynapseContext } from '../../utils'
 import AccessRequirementList from '../AccessRequirementList/AccessRequirementList'
 import { RestrictableObjectType } from '@sage-bionetworks/synapse-types'
 import { SynapseSpinner } from '../LoadingScreen/LoadingScreen'
-import { Alert, Typography } from '@mui/material'
+import { Alert, Button, Typography } from '@mui/material'
 import { isEmpty } from 'lodash-es'
 
 export type ChallengeRequirementsModalProps = {
@@ -104,8 +103,8 @@ export default function ChallengeRequirementsModal(
     registrationError,
   ].filter((e): e is SynapseClientError => Boolean(e))
 
-   // It's possible that the user joined the team, but requirements on the team changed since they became a member
-   // They do not need to re-join the team, but they should still be prompted to accept the requirements
+  // It's possible that the user joined the team, but requirements on the team changed since they became a member
+  // They do not need to re-join the team, but they should still be prompted to accept the requirements
   let registerButtonText = teamMembershipStatus?.isMember
     ? 'Continue'
     : 'Register'
@@ -113,44 +112,50 @@ export default function ChallengeRequirementsModal(
     registerButtonText = 'Registering...'
   }
 
+  if (!isEmpty(errors)) {
+    return (
+      <Alert severity="error">
+        {errors.map((e, index) => (
+          <Typography variant={'body1'} key={index}>
+            {e.reason}
+          </Typography>
+        ))}
+      </Alert>
+    )
+  }
+
+  if (!participantTeamId || !open) {
+    return <></>
+  }
+
   return (
-    <ConfirmationDialog
-      open={open}
-      title={`Challenge Terms and Conditions`}
-      content={
+    <AccessRequirementList
+      dialogTitle={`Challenge Terms and Conditions`}
+      subjectId={participantTeamId}
+      subjectType={RestrictableObjectType.TEAM}
+      teamId={challenge?.participantTeamId}
+      renderAsModal={true}
+      requestObjectName={project?.name}
+      onHide={() => {
+        onCancel()
+      }}
+      customDialogActions={
         <>
-          {participantTeamId && (
-            <AccessRequirementList
-              subjectId={participantTeamId}
-              subjectType={RestrictableObjectType.TEAM}
-              teamId={challenge?.participantTeamId}
-              renderAsModal={false}
-              requestObjectName={project?.name}
-              onHide={() => {
-                onCancel()
-              }}
-            />
-          )}
-          {!isEmpty(errors) && (
-            <Alert severity="error">
-              {errors.map((e, index) => (
-                <Typography variant={'body1'} key={index}>
-                  {e.reason}
-                </Typography>
-              ))}
-            </Alert>
-          )}
+          <Button variant={'outlined'} onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button
+            variant={'contained'}
+            onClick={() => {
+              registerForChallenge()
+            }}
+            startIcon={registrationIsPending ? <SynapseSpinner /> : undefined}
+            disabled={!meetsAllRequirements || registrationIsPending}
+          >
+            {registerButtonText}
+          </Button>
         </>
       }
-      onCancel={onCancel}
-      onConfirm={() => {
-        registerForChallenge()
-      }}
-      confirmButtonProps={{
-        children: registerButtonText,
-        startIcon: registrationIsPending ? <SynapseSpinner /> : undefined,
-        disabled: !meetsAllRequirements || registrationIsPending,
-      }}
     />
   )
 }
diff --git a/packages/synapse-react-client/src/components/DialogBase.tsx b/packages/synapse-react-client/src/components/DialogBase.tsx
index 7fa7e8d8a9..61893e8313 100644
--- a/packages/synapse-react-client/src/components/DialogBase.tsx
+++ b/packages/synapse-react-client/src/components/DialogBase.tsx
@@ -35,15 +35,38 @@ export const CloseButton: React.FC<CloseButtonProps> = ({
   )
 }
 
-export type DialogBaseProps = {
-  open: boolean
+export type DialogBaseTitleProps = {
   title: React.ReactNode
+  titleHelpPopoverProps?: HelpPopoverProps
+  hasCloseButton?: boolean
+  onCancel: () => void
+}
+
+export function DialogBaseTitle(props: DialogBaseTitleProps) {
+  const {
+    title,
+    titleHelpPopoverProps,
+    hasCloseButton = true,
+    onCancel,
+  } = props
+  return (
+    <DialogTitle>
+      <Stack direction="row" alignItems={'center'} gap={'5px'}>
+        {title}
+        {titleHelpPopoverProps && <HelpPopover {...titleHelpPopoverProps} />}
+        <Box sx={{ flexGrow: 1 }} />
+        {hasCloseButton && <CloseButton onClick={() => onCancel()} />}
+      </Stack>
+    </DialogTitle>
+  )
+}
+
+export type DialogBaseProps = DialogBaseTitleProps & {
+  open: boolean
   content: React.ReactNode
   actions?: React.ReactNode
   className?: string
   onCancel: () => void
-  hasCloseButton?: boolean
-  titleHelpPopoverProps?: HelpPopoverProps
   maxWidth?: DialogProps['maxWidth']
   fullWidth?: boolean
   sx?: DialogProps['sx']
@@ -60,7 +83,7 @@ export const DialogBase = ({
   actions,
   className,
   onCancel,
-  hasCloseButton = true,
+  hasCloseButton,
   titleHelpPopoverProps,
   maxWidth = 'sm',
   fullWidth = true,
@@ -76,14 +99,12 @@ export const DialogBase = ({
       onClose={() => onCancel()}
       sx={sx}
     >
-      <DialogTitle>
-        <Stack direction="row" alignItems={'center'} gap={'5px'}>
-          {title}
-          {titleHelpPopoverProps && <HelpPopover {...titleHelpPopoverProps} />}
-          <Box sx={{ flexGrow: 1 }} />
-          {hasCloseButton && <CloseButton onClick={() => onCancel()} />}
-        </Stack>
-      </DialogTitle>
+      <DialogBaseTitle
+        title={title}
+        titleHelpPopoverProps={titleHelpPopoverProps}
+        hasCloseButton={hasCloseButton}
+        onCancel={onCancel}
+      />
       <DialogContent {...contentProps}>{content}</DialogContent>
       {actions && <DialogActions>{actions}</DialogActions>}
     </Dialog>