1 files changed, 9 insertions, 2 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
index 814f9b38e0..2b4d5571f3 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
@@ -152,14 +152,21 @@ class HeatScreenView extends Component {
                             }
                             onProcessAndValidate={onProcessAndValidate}
                             softwareProductId={softwareProductId}
-                            isReadOnlyMode={isReadOnlyMode}
+                            isReadOnlyMode={
+                                isReadOnlyMode ||
+                                (candidateInProcess && !goToOverview) ||
+                                !candidateInProcess
+                            }
                             version={version}
                         />
                     </Tab>
                     <Tab
                         tabId={tabsMapping.VALIDATION}
                         title="Validation"
-                        disabled={!isValidationAvailable || candidateInProcess}>
+                        disabled={
+                            goToOverview &&
+                            (!isValidationAvailable || candidateInProcess)
+                        }>
                         <HeatValidation {...other} />
                     </Tab>
                 </Tabs>