diff --git a/src/components/dialogs/edit-simulator.js b/src/components/dialogs/edit-simulator.js
index 74edcd2..89ff7e7 100644
--- a/src/components/dialogs/edit-simulator.js
+++ b/src/components/dialogs/edit-simulator.js
@@ -41,7 +41,7 @@ class EditSimulatorDialog extends React.Component {
   onClose(canceled) {
     if (canceled === false) {
       if (this.valid) {
-        let data = {};
+        let data = this.props.simulator.properties;
 
         if (this.state.name != null && this.state.name !== "" && this.state.name !== _.get(this.props.simulator, 'rawProperties.name')) {
           data.name = this.state.name;
@@ -85,7 +85,7 @@ class EditSimulatorDialog extends React.Component {
           </FormGroup>
           <FormGroup controlId='properties'>
             <FormLabel column={false}>Properties</FormLabel>
-            <ParametersEditor content={_.merge({}, this.props.simulator.rawProperties, this.props.simulator.properties)} disabled={true} />
+            <ParametersEditor content={_.merge({}, _.get(this.props.simulator, 'rawProperties'), _.get(this.props.simulator, 'properties'))} disabled={true} />
           </FormGroup>
         </form>
       </Dialog>
diff --git a/src/containers/simulators.js b/src/containers/simulators.js
index f73e7d3..aae637f 100644
--- a/src/containers/simulators.js
+++ b/src/containers/simulators.js
@@ -96,7 +96,7 @@ class Simulators extends Component {
     });
 
     // Start timer for periodic refresh
-    this.timer = window.setInterval(() => this.refresh(), 5000);
+    this.timer = window.setInterval(() => this.refresh(), 10000);
   }
 
   componentWillUnmount() {