diff --git a/components/lib/dialog/Dialog.js b/components/lib/dialog/Dialog.js
index 6f35885e14..b98194ee21 100644
--- a/components/lib/dialog/Dialog.js
+++ b/components/lib/dialog/Dialog.js
@@ -703,7 +703,7 @@ export const Dialog = React.forwardRef((inProps, ref) => {
             <div {...maskProps}>
                 <CSSTransition nodeRef={dialogRef} {...transitionProps}>
                     <div {...rootProps}>
-                        <FocusTrap autoFocus>{contentElement}</FocusTrap>
+                        <FocusTrap autoFocus={props.focusOnShow}>{contentElement}</FocusTrap>
                     </div>
                 </CSSTransition>
             </div>