diff --git a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/style.scss b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/style.scss
index 726f16de7..3149c5a7b 100644
--- a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/style.scss
+++ b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/style.scss
@@ -40,7 +40,7 @@ html.nfd-interface-interface-skeleton__html-container {
 	}
 
 	&__overlay {
-
+		// z-index: to display over sidebar.
 		&--disabled {
 			position: fixed;
 			top: 0;
@@ -49,7 +49,7 @@ html.nfd-interface-interface-skeleton__html-container {
 			bottom: 0;
 			background: rgba(var(--nfd-onboarding-secondary-rgb), 0.3);
 			cursor: not-allowed;
-			z-index: 30;
+			z-index: 1000001;
 		}
 	}
 }
diff --git a/src/OnboardingSPA/steps/SiteGen/Editor/Header/index.js b/src/OnboardingSPA/steps/SiteGen/Editor/Header/index.js
index c7ac92d8c..82f9f72f0 100644
--- a/src/OnboardingSPA/steps/SiteGen/Editor/Header/index.js
+++ b/src/OnboardingSPA/steps/SiteGen/Editor/Header/index.js
@@ -224,7 +224,7 @@ const StepSiteGenEditorHeader = () => {
 	}, [ currentData ] );
 
 	useEffect( () => {
-		if ( isSaving ) {
+		if ( isSaving || isRegenerating ) {
 			setInteractionDisabled( true );
 		} else {
 			setInteractionDisabled( false );
@@ -233,7 +233,7 @@ const StepSiteGenEditorHeader = () => {
 		return () => {
 			setInteractionDisabled( false );
 		};
-	}, [ isSaving ] );
+	}, [ isSaving, isRegenerating ] );
 
 	return (
 		<>