diff --git a/src/components/monitor-list/monitor-list.jsx b/src/components/monitor-list/monitor-list.jsx
index 32090070e79663f6ac1b6e77708870971372918e..cc6a53e93bdb388fad2c574e5b87f43df0647092 100644
--- a/src/components/monitor-list/monitor-list.jsx
+++ b/src/components/monitor-list/monitor-list.jsx
@@ -2,7 +2,7 @@ const React = require('react');
 const Box = require('../box/box.jsx');
 const Monitor = require('../../containers/monitor.jsx');
 const PropTypes = require('prop-types');
-const {Map} = require('immutable');
+const {OrderedMap} = require('immutable');
 
 
 const styles = require('./monitor-list.css');
@@ -13,12 +13,12 @@ const MonitorList = props => (
     >
         {props.monitors.valueSeq().map(monitorData => (
             <Monitor
-                color={monitorData.get('color')}
-                key={monitorData.get('id')}
-                label={monitorData.get('label')}
-                value={monitorData.get('value')}
-                x={monitorData.get('x')}
-                y={monitorData.get('y')}
+                color={monitorData.color}
+                key={monitorData.id}
+                label={monitorData.label}
+                value={monitorData.value}
+                x={monitorData.x}
+                y={monitorData.y}
                 onDragEnd={props.onMonitorChange}
             />
         ))}
@@ -26,7 +26,7 @@ const MonitorList = props => (
 );
 
 MonitorList.propTypes = {
-    monitors: PropTypes.instanceOf(Map),
+    monitors: PropTypes.instanceOf(OrderedMap),
     onMonitorChange: PropTypes.func.isRequired
 };
 
diff --git a/src/reducers/monitors.js b/src/reducers/monitors.js
index 80cf3a2fb753ff3a7d07bd70e5b4fe96aa50db2e..e21e67a0193a5a1d40a9690a877d05cd75ca0aa4 100644
--- a/src/reducers/monitors.js
+++ b/src/reducers/monitors.js
@@ -1,7 +1,7 @@
 const UPDATE_MONITORS = 'scratch-gui/monitors/UPDATE_MONITORS';
-const {Map} = require('immutable');
+const {OrderedMap} = require('immutable');
 
-const initialState = Map();
+const initialState = OrderedMap();
 
 const reducer = function (state, action) {
     if (typeof state === 'undefined') state = initialState;