diff --git a/creativecloud/blocks/interactive-metadata/interactive-metadata.js b/creativecloud/blocks/interactive-metadata/interactive-metadata.js
index 136097446..0df5d72cc 100644
--- a/creativecloud/blocks/interactive-metadata/interactive-metadata.js
+++ b/creativecloud/blocks/interactive-metadata/interactive-metadata.js
@@ -149,7 +149,7 @@ async function handleLayerDisplay(stepInfo) {
   await handleImageTransition(stepInfo);
   await loadAllImgs(currLayer.querySelectorAll('img[src*="media_"]'));
   await decorateDefaultLinkAnalytics(currLayer);
-  if (prevStepIndex) stepInfo.target.classList.remove(`step-${stepInfo.stepList[prevStepIndex]}`);
+  if (prevStepIndex !== stepInfo.stepIndex) stepInfo.target.classList.remove(`step-${stepInfo.stepList[prevStepIndex]}`);
   if (clsLayer) clsLayer.remove();
   stepInfo.target.classList.add(`step-${stepInfo.stepName}`);
   currLayer.classList.add('show-layer');
diff --git a/creativecloud/features/interactive-components/start-over/start-over.js b/creativecloud/features/interactive-components/start-over/start-over.js
index 25e5aec3c..375160fe0 100644
--- a/creativecloud/features/interactive-components/start-over/start-over.js
+++ b/creativecloud/features/interactive-components/start-over/start-over.js
@@ -5,7 +5,7 @@ function btnLoadDelay(layer, button, delay, once = true) {
     entries.forEach(async (entry) => {
       if (entry.isIntersecting) {
         if (once) observer.unobserve(entry.target);
-        setTimeout(() => { button.style.display = 'flex'; }, parseInt(delay, 10));
+        setTimeout(() => { button.style.display = 'flex'; }, delay);
       }
     });
   });
@@ -37,8 +37,11 @@ export default async function stepInit(data) {
       data.el.dispatchEvent(new CustomEvent(data.nextStepEvent));
     });
   }
-  if (delay) btnLoadDelay(layer, startOverCTA, delay);
-  else startOverCTA.style.display = 'flex';
+  if (delay) {
+    const dInt = parseInt(delay, 10);
+    const normDelay = dInt > 99 ? dInt : (dInt * 1000);
+    btnLoadDelay(layer, startOverCTA, normDelay);
+  } else startOverCTA.style.display = 'flex';
   layer.append(startOverCTA);
   return layer;
 }