diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5afceb5c2..3fd514d39b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,11 @@
 1. [#1795](https://github.com/influxdata/chronograf/pull/1795): Fix uptime status on Windows hosts running Telegraf
 1. [#1715](https://github.com/influxdata/chronograf/pull/1715): Chronograf now renders on IE11.
 1. [#1845](https://github.com/influxdata/chronograf/pull/1845): Fix no-scroll bar appearing in the Data Explorer table
+1. [#1870](https://github.com/influxdata/chronograf/pull/1870): Fix console error for placing prop on div
 1. [#1864](https://github.com/influxdata/chronograf/pull/1864): Fix Write Data form upload button and add `onDragExit` handler
 1. [#1866](https://github.com/influxdata/chronograf/pull/1866): Fix missing cell type (and consequently single-stat)
 
+
 ### Features
 1. [#1863](https://github.com/influxdata/chronograf/pull/1863): Improve 'new-sources' server flag example by adding 'type' key
 
diff --git a/ui/src/dashboards/components/CellEditorOverlay.js b/ui/src/dashboards/components/CellEditorOverlay.js
index a5708abcd7..b21a3a39f3 100644
--- a/ui/src/dashboards/components/CellEditorOverlay.js
+++ b/ui/src/dashboards/components/CellEditorOverlay.js
@@ -246,7 +246,7 @@ class CellEditorOverlay extends Component {
             queryConfigs={queriesWorkingDraft}
             editQueryStatus={editQueryStatus}
           />
-          <div className="overlay-technology--editor">
+          <CEOBottom>
             <OverlayControls
               isDisplayOptionsTabActive={isDisplayOptionsTabActive}
               onClickDisplayOptions={this.handleClickDisplayOptionsTab}
@@ -275,14 +275,19 @@ class CellEditorOverlay extends Component {
                   activeQuery={this.getActiveQuery()}
                   setActiveQueryIndex={this.handleSetActiveQueryIndex}
                 />}
-          </div>
+          </CEOBottom>
         </ResizeContainer>
       </div>
     )
   }
 }
 
-const {arrayOf, func, number, shape, string} = PropTypes
+const CEOBottom = ({children}) =>
+  <div className="overlay-technology--editor">
+    {children}
+  </div>
+
+const {arrayOf, func, node, number, shape, string} = PropTypes
 
 CellEditorOverlay.propTypes = {
   onCancel: func.isRequired,
@@ -312,4 +317,8 @@ CellEditorOverlay.propTypes = {
   dashboardID: string.isRequired,
 }
 
+CEOBottom.propTypes = {
+  children: node,
+}
+
 export default CellEditorOverlay
diff --git a/ui/src/data_explorer/components/WriteDataBody.js b/ui/src/data_explorer/components/WriteDataBody.js
index f9497574b3..94483e233d 100644
--- a/ui/src/data_explorer/components/WriteDataBody.js
+++ b/ui/src/data_explorer/components/WriteDataBody.js
@@ -38,8 +38,9 @@ const WriteDataBody = ({
             className="write-data-form--upload-button btn btn-md btn-primary"
             onClick={handleFileOpen}
           >
-            {uploadContent ? 'Choose Another File to Upload'
-                           : 'Choose a File to Upload'}
+            {uploadContent
+              ? 'Choose Another File to Upload'
+              : 'Choose a File to Upload'}
           </button>
           {uploadContent
             ? <span className="write-data-form--filepath_selected">