diff --git a/src/cursors-component.coffee b/src/cursors-component.coffee
index e2251351f..55f922cc8 100644
--- a/src/cursors-component.coffee
+++ b/src/cursors-component.coffee
@@ -14,11 +14,12 @@ CursorsComponent = React.createClass
 
   render: ->
     {editor} = @props
-    {blinkCursorsOff} = @state
+    blinkOff = @state.blinkCursorsOff
 
     div className: 'cursors',
       for selection in editor.getSelections() when editor.selectionIntersectsVisibleRowRange(selection)
-        CursorComponent(cursor: selection.cursor, blinkOff: blinkCursorsOff)
+        {cursor} = selection
+        CursorComponent({key: cursor.id, cursor, blinkOff})
 
   getInitialState: ->
     blinkCursorsOff: false
diff --git a/src/selections-component.coffee b/src/selections-component.coffee
index 1a2ae93fe..1cb58b546 100644
--- a/src/selections-component.coffee
+++ b/src/selections-component.coffee
@@ -11,4 +11,4 @@ SelectionsComponent = React.createClass
 
     div className: 'selections',
       for selection in editor.getSelections() when editor.selectionIntersectsVisibleRowRange(selection)
-        SelectionComponent({selection})
+        SelectionComponent({key: selection.id, selection})