diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js
index 1bd4002..27d4542 100644
--- a/src/dashboard/dashboard.js
+++ b/src/dashboard/dashboard.js
@@ -512,7 +512,7 @@ class Dashboard extends Component {
         {!draggable ? (
           <WidgetArea widgets={this.state.widgets} dropZoneHeight={dropZoneHeight} editing={this.state.editing} grid={grid} onWidgetAdded={this.handleDrop.bind(this)}>
             {this.state.widgets != null && Object.keys(this.state.widgets).map(widgetKey => (
-              <WidgetContainer widget={this.state.widgets[widgetKey]}>
+              <WidgetContainer widget={this.state.widgets[widgetKey]} key={widgetKey}>
                 <WidgetContextMenu
                   key={widgetKey}
                   index={parseInt(widgetKey, 10)}
@@ -536,6 +536,7 @@ class Dashboard extends Component {
               {this.state.widgets != null && Object.keys(this.state.widgets).map(widgetKey => (
                 <EditableWidgetContainer
                   widget={this.state.widgets[widgetKey]}
+                  key={widgetKey}
                   grid={grid}
                   index={parseInt(widgetKey, 10)}
                   onWidgetChange={this.widgetChange.bind(this)}>
diff --git a/src/dashboard/edit-dashboard.js b/src/dashboard/edit-dashboard.js
index 900a6c8..cb062ce 100644
--- a/src/dashboard/edit-dashboard.js
+++ b/src/dashboard/edit-dashboard.js
@@ -73,7 +73,7 @@ class EditDashboardDialog extends React.Component {
     return (
       <Dialog show={this.props.show} title="Edit Dashboard" buttonTitle="Save" 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 />