2 files changed, 12 insertions, 8 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/Onboarding.js b/openecomp-ui/src/sdc-app/onboarding/Onboarding.js
index b894e3f031..fbeda31126 100644
--- a/openecomp-ui/src/sdc-app/onboarding/Onboarding.js
+++ b/openecomp-ui/src/sdc-app/onboarding/Onboarding.js
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,9 @@
 import OnboardingView from './OnboardingView.jsx';
 import { connect } from 'react-redux';
 
-const mapStateToProps = ({ currentScreen }) => ({ currentScreen });
+const mapStateToProps = ({ currentScreen, loader: { isLoading } }) => ({
+    currentScreen,
+    isLoading
+});
 const Onboarding = connect(mapStateToProps, null)(OnboardingView);
 export default Onboarding;
diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx b/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx
index 69e514bc6e..7156e2e253 100644
--- a/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -74,11 +74,12 @@ export default class OnboardingView extends React.Component {
     }
 
     render() {
-        let { currentScreen } = this.props;
+        let { currentScreen, isLoading } = this.props;
         let { screen, props } = currentScreen;
-
+        const preventClicks = isLoading ? 'no-pointer-events' : '';
         return (
-            <div className="dox-ui dox-ui-punch-out dox-ui-punch-out-full-page">
+            <div
+                className={`dox-ui dox-ui-punch-out dox-ui-punch-out-full-page ${preventClicks}`}>
                 {(() => {
                     switch (screen) {
                         case enums.SCREEN.ONBOARDING_CATALOG: