diff --git a/extensions/default/src/ViewerLayout/index.tsx b/extensions/default/src/ViewerLayout/index.tsx
index dac359e7a..3125dd136 100644
--- a/extensions/default/src/ViewerLayout/index.tsx
+++ b/extensions/default/src/ViewerLayout/index.tsx
@@ -156,7 +156,7 @@ function ViewerLayout({
           ) : null}
         </React.Fragment>
       </div>
-      <Onboarding servicesManager={servicesManager} />
+      <Onboarding />
       <InvestigationalUseDialog dialogConfiguration={appConfig?.investigationalUseDialog} />
     </div>
   );
diff --git a/platform/app/public/config/default.js b/platform/app/public/config/default.js
index 42cae0c7f..504f623b2 100644
--- a/platform/app/public/config/default.js
+++ b/platform/app/public/config/default.js
@@ -300,8 +300,8 @@ window.config = {
           id: 'scroll',
           text: 'You can scroll through the images using the mouse wheel or scrollbar.',
           attachTo: {
-            element: '.scroll',
-            on: 'left-start',
+            element: '.viewport-element',
+            on: 'top',
           },
           advanceOn: {
             selector: '.cornerstone-viewport-element',
@@ -329,6 +329,7 @@ window.config = {
           text: 'You can zoom the images using the right click.',
           attachTo: {
             element: '.viewport-element',
+            on: 'top',
           },
           advanceOn: {
             selector: '.cornerstone-viewport-element',
@@ -340,6 +341,7 @@ window.config = {
           text: 'You can pan the images using the middle click.',
           attachTo: {
             element: '.viewport-element',
+            on: 'top',
           },
           advanceOn: {
             selector: '.cornerstone-viewport-element',
@@ -351,7 +353,7 @@ window.config = {
           text: 'You can modify the window level using the left click.',
           attachTo: {
             element: '.viewport-element',
-            on: 'left-start',
+            on: 'top',
           },
           advanceOn: {
             selector: '.cornerstone-viewport-element',
@@ -375,7 +377,7 @@ window.config = {
           text: 'Use the length tool on the viewport to measure the length of a region.',
           attachTo: {
             element: '.viewport-element',
-            on: 'left-start',
+            on: 'top',
           },
           advanceOn: {
             selector: 'body',
@@ -410,7 +412,7 @@ window.config = {
           id: 'scrollAwayFromMeasurement',
           text: 'Scroll the images using the mouse wheel away from the measurement.',
           attachTo: {
-            element: '.scroll',
+            element: '.viewport-element',
             on: 'left-start',
           },
           advanceOn: {
@@ -455,7 +457,9 @@ window.config = {
           },
         },
       ],
-      tourOptions: {},
+      tourOptions: {
+        useModalOverlay: true,
+      },
     },
   ],
 };
diff --git a/platform/app/src/routes/WorkList/WorkList.tsx b/platform/app/src/routes/WorkList/WorkList.tsx
index f8a6c76d3..785810ca3 100644
--- a/platform/app/src/routes/WorkList/WorkList.tsx
+++ b/platform/app/src/routes/WorkList/WorkList.tsx
@@ -535,7 +535,7 @@ function WorkList({
         WhiteLabeling={appConfig.whiteLabeling}
         showPatientInfo={PatientInfoVisibility.DISABLED}
       />
-      <Onboarding servicesManager={servicesManager} />
+      <Onboarding />
       <InvestigationalUseDialog dialogConfiguration={appConfig?.investigationalUseDialog} />
       <div className="ohif-scrollbar ohif-scrollbar-stable-gutter flex grow flex-col overflow-y-auto sm:px-5">
         <StudyListFilter
diff --git a/platform/ui-next/src/components/Onboarding/Onboarding.tsx b/platform/ui-next/src/components/Onboarding/Onboarding.tsx
index da257f8c4..f5fa39450 100644
--- a/platform/ui-next/src/components/Onboarding/Onboarding.tsx
+++ b/platform/ui-next/src/components/Onboarding/Onboarding.tsx
@@ -17,7 +17,7 @@ const markTourAsShown = (tourId: string) => {
   }
 };
 
-const Onboarding = ({ servicesManager }: withAppTypes) => {
+const Onboarding = () => {
   const Shepherd = useShepherd();
   const location = useLocation();
   const tours = window.config.tours as Array<{
@@ -59,7 +59,6 @@ const Onboarding = ({ servicesManager }: withAppTypes) => {
       startTour();
     }
   }, [Shepherd, tours, location.pathname]);
-
   return null;
 };