diff --git a/src/dashboard/new-dashboard.js b/src/dashboard/new-dashboard.js
index e71fdbc7bcf8e3f09c3fa1f33e5415753a22eb99..6f4b9da9dac9c62d3156323d78206cc0670a55ff 100644
--- a/src/dashboard/new-dashboard.js
+++ b/src/dashboard/new-dashboard.js
@@ -69,7 +69,7 @@ class NewDashboardDialog extends React.Component {
     return (
       <Dialog show={this.props.show} title="New Dashboard" buttonTitle="Add" onClose={(c) => this.onClose(c)} onReset={() => this.resetState()} valid={this.valid}>
         <form>
-          <FormGroup controlId="name" validationState={this.validateForm('name')}>
+          <FormGroup controlId="name" validationstate={this.validateForm('name')}>
             <FormLabel>Name</FormLabel>
             <FormControl type="text" placeholder="Enter name" value={this.state.name} onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 1cd8706d569ce2e505897b162ed328b084e80156..ba55f349365723b1ffccd2f73ea30f99f48c85f2 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -292,12 +292,12 @@ class Scenario extends React.Component {
 
   closeNewDashboardModal(data) {
     this.setState({ newDashboardModal : false });
-    let newDashboard = data;
-    // add default grid value and scenarioID
-    newDashboard["grid"] = 15;
-    newDashboard["scenarioID"] = this.state.scenario.id;
-
     if (data) {
+      let newDashboard = data;
+      // add default grid value and scenarioID
+      newDashboard["grid"] = 15;
+      newDashboard["scenarioID"] = this.state.scenario.id;
+
       AppDispatcher.dispatch({
         type: 'dashboards/start-add',
         data,