diff --git a/package.json b/package.json
index ed56ee081e..cca4088d0f 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "prettier": "^1.8.2",
     "react": "^15.5.0",
     "react-addons-test-utils": "^15.3.2",
-    "react-codemirror2": "^2.0.2",
+    "react-codemirror2": "^4.1.0",
     "react-dom": "^15.3.2",
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
diff --git a/playground/app.js b/playground/app.js
index e7fd1ccc82..5b30930bcd 100644
--- a/playground/app.js
+++ b/playground/app.js
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { render } from "react-dom";
-import CodeMirror from "react-codemirror2";
+import { UnControlled as CodeMirror } from "react-codemirror2";
 import "codemirror/mode/javascript/javascript";
 
 import { shouldRender } from "../src/utils";
@@ -213,6 +213,7 @@ class Editor extends Component {
         <CodeMirror
           value={this.state.code}
           onChange={this.onCodeChange}
+          autoCursor={false}
           options={Object.assign({}, cmOptions, { theme })}
         />
       </div>