diff --git a/_js/live_editor.js b/_js/live_editor.js
index af4bc392..955e2825 100644
--- a/_js/live_editor.js
+++ b/_js/live_editor.js
@@ -21,6 +21,7 @@ var CodeMirrorEditor = React.createClass({
       mode: 'javascript',
       lineNumbers: false,
       lineWrapping: true,
+      smartIndent: false,  // javascript mode does bad things with jsx indents
       matchBrackets: true,
       theme: 'solarized-light',
       readOnly: this.props.readOnly