diff --git a/dev/App.js b/dev/App.js
index b953829be..b8947176d 100644
--- a/dev/App.js
+++ b/dev/App.js
@@ -33,7 +33,6 @@ class App extends Component {
     // _fullLayout etc in handlePlotUpdate()
     this.state = {
       graphDiv: {},
-      editorRevision: 0,
       plotRevision: 0,
       currentMockIndex: -1,
       mocks: [],
@@ -51,7 +50,7 @@ class App extends Component {
   }
 
   handlePlotUpdate(graphDiv) {
-    this.setState(({editorRevision: x}) => ({editorRevision: x + 1, graphDiv}));
+    this.setState({graphDiv});
   }
 
   handleEditorUpdate() {
@@ -82,7 +81,6 @@ class App extends Component {
           <PlotlyEditor
             graphDiv={this.state.graphDiv}
             onUpdate={this.handleEditorUpdate.bind(this)}
-            revision={this.state.editorRevision}
             dataSources={dataSources}
             dataSourceOptions={dataSourceOptions}
             plotly={plotly}
diff --git a/src/PlotlyEditor.js b/src/PlotlyEditor.js
index c62ce78d0..904e6bd25 100644
--- a/src/PlotlyEditor.js
+++ b/src/PlotlyEditor.js
@@ -19,18 +19,6 @@ class PlotlyEditor extends Component {
     }
   }
 
-  shouldComponentUpdate(nextProps) {
-    if (
-      nextProps.revision === void 0 ||
-      nextProps.revision !== this.props.revision ||
-      nextProps.dataSources !== this.props.dataSources ||
-      nextProps.dataSourceOptions !== this.props.dataSourceOptions
-    ) {
-      return true;
-    }
-    return false;
-  }
-
   getChildContext() {
     const gd = this.props.graphDiv || {};
     return {
@@ -253,7 +241,6 @@ PlotlyEditor.propTypes = {
   locale: PropTypes.string,
   onUpdate: PropTypes.func,
   plotly: PropTypes.object,
-  revision: PropTypes.any,
   traceTypesConfig: PropTypes.object,
 };
 
diff --git a/src/__tests__/PlotlyEditor-test.js b/src/__tests__/PlotlyEditor-test.js
deleted file mode 100644
index cbc68817f..000000000
--- a/src/__tests__/PlotlyEditor-test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import PlotlyEditor from '../PlotlyEditor';
-import React from 'react';
-import {shallow} from '../lib/test-utils';
-
-describe('<PlotlyEditor>', () => {
-  it('does not update when numeric revision has not changed', () => {
-    const wrapper = shallow(<PlotlyEditor revision={2} />);
-    const editorRender = jest.spyOn(wrapper.instance(), 'render');
-
-    expect(editorRender).not.toHaveBeenCalled();
-    wrapper.setProps({revision: 2});
-    expect(editorRender).not.toHaveBeenCalled();
-  });
-
-  it('does not update when string revision has not changed', () => {
-    const wrapper = shallow(<PlotlyEditor revision={'thor'} />);
-    const editorRender = jest.spyOn(wrapper.instance(), 'render');
-
-    expect(editorRender).not.toHaveBeenCalled();
-    wrapper.setProps({revision: 'thor'});
-    expect(editorRender).not.toHaveBeenCalled();
-  });
-
-  it('updates when numeric revision is changed', () => {
-    const wrapper = shallow(<PlotlyEditor revision={2} />);
-    const editorRender = jest.spyOn(wrapper.instance(), 'render');
-
-    expect(editorRender).not.toHaveBeenCalled();
-    wrapper.setProps({revision: 3});
-    expect(editorRender).toHaveBeenCalled();
-  });
-
-  it('updates when string revision is changed', () => {
-    const wrapper = shallow(<PlotlyEditor revision={'thor'} />);
-    const editorRender = jest.spyOn(wrapper.instance(), 'render');
-
-    expect(editorRender).not.toHaveBeenCalled();
-    wrapper.setProps({revision: 'roht'});
-    expect(editorRender).toHaveBeenCalled();
-  });
-
-  it('updates when revision is not a number', () => {
-    const wrapper = shallow(<PlotlyEditor />);
-    const editorRender = jest.spyOn(wrapper.instance(), 'render');
-
-    expect(editorRender).not.toHaveBeenCalled();
-    wrapper.setProps({onUpdate: jest.fn()});
-    expect(editorRender).toHaveBeenCalled();
-  });
-});
diff --git a/src/components/containers/Section.js b/src/components/containers/Section.js
index ff0f28512..7e827e28b 100644
--- a/src/components/containers/Section.js
+++ b/src/components/containers/Section.js
@@ -42,6 +42,7 @@ class Section extends Component {
         // for now, only allowing for cartesian chart types
         if (
           data.length > 1 &&
+          data[fullContainer.index] &&
           traceTypeToAxisType(data[fullContainer.index].type) === 'cartesian'
         ) {
           this.sectionVisible = true;
diff --git a/src/components/fields/TraceSelector.js b/src/components/fields/TraceSelector.js
index 9302224eb..357128912 100644
--- a/src/components/fields/TraceSelector.js
+++ b/src/components/fields/TraceSelector.js
@@ -127,7 +127,7 @@ TraceSelector.propTypes = {
   getValObject: PropTypes.func,
   container: PropTypes.object.isRequired,
   fullContainer: PropTypes.object.isRequired,
-  fullValue: PropTypes.any.isRequired,
+  fullValue: PropTypes.any,
   localize: PropTypes.func,
   updateContainer: PropTypes.func,
 };