diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
index 6eb71ade7..0c885e7ee 100644
--- a/src/actions/WindowActions.js
+++ b/src/actions/WindowActions.js
@@ -498,7 +498,6 @@ export function createProcess(processType, viewId, type, ids, tabId, rowId) {
throw new Error('close_modal');
}else{
dispatch(initDataSuccess(preparedData, 'modal'));
-
dispatch(initLayout('process', processType)).then(response => {
const preparedLayout = Object.assign({}, response.data, {
pinstanceId: pid
diff --git a/src/components/header/MenuOverlay.js b/src/components/header/MenuOverlay.js
index 650c79ae2..9cd0e08b5 100644
--- a/src/components/header/MenuOverlay.js
+++ b/src/components/header/MenuOverlay.js
@@ -186,7 +186,7 @@ class MenuOverlay extends Component {
renderNaviagtion = (node) => {
const {path} = this.state;
- const {handleMenuOverlay} = this.props;
+ const {handleMenuOverlay, openModal} = this.props;
return (
this.handleClickBack(e)}
handleMenuOverlay={handleMenuOverlay}
+ openModal={openModal}
{...item}
/>
)}
diff --git a/src/containers/DocList.js b/src/containers/DocList.js
index f3bd1c41a..4e593739a 100644
--- a/src/containers/DocList.js
+++ b/src/containers/DocList.js
@@ -96,8 +96,8 @@ class DocList extends Component {
rawModalVisible={rawModal.visible}
indicator={indicator}
isDocumentNotSaved={
- !modal.saveStatus.saved &&
- !modal.validStatus.initialValue
+ (modal.saveStatus && !modal.saveStatus.saved) &&
+ (modal.validStatus && !modal.validStatus.initialValue)
}
/>
}
diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
index 787587b33..ad83f009a 100644
--- a/src/containers/MasterWindow.js
+++ b/src/containers/MasterWindow.js
@@ -148,8 +148,8 @@ class MasterWindow extends Component {
rawModalVisible={rawModal.visible}
indicator={indicator}
isDocumentNotSaved={
- !modal.saveStatus.saved &&
- !modal.validStatus.initialValue
+ (modal.saveStatus && !modal.saveStatus.saved) &&
+ (modal.validStatus && !modal.validStatus.initialValue)
}
/>
}