diff --git a/src/components/Step.tsx b/src/components/Step.tsx
index d7c3b9d9..0a6e8d9d 100644
--- a/src/components/Step.tsx
+++ b/src/components/Step.tsx
@@ -39,6 +39,7 @@ export default class JoyrideStep extends React.Component<StepProps> {
       helpers,
       index,
       lifecycle,
+      shouldScroll,
       status,
       step,
       store,
@@ -139,7 +140,7 @@ export default class JoyrideStep extends React.Component<StepProps> {
         type: EVENTS.TOOLTIP,
       });
 
-      if (this.tooltip) {
+      if (shouldScroll && this.tooltip) {
         this.scope = new Scope(this.tooltip, { selector: '[data-action=primary]' });
         this.scope.setFocus();
       }