diff --git a/ui/src/data_explorer/components/QueryEditor.js b/ui/src/data_explorer/components/QueryEditor.js
index 4e7983be6e..65d2b4b6d7 100644
--- a/ui/src/data_explorer/components/QueryEditor.js
+++ b/ui/src/data_explorer/components/QueryEditor.js
@@ -78,7 +78,7 @@ const QueryEditor = React.createClass({
     return (
       <div className="query-builder--tab-contents">
         <div>
-          <RawQueryEditor query={q} onUpdate={this.handleEditRawText} />
+          <RawQueryEditor query={q} config={query} onUpdate={this.handleEditRawText} />
           {this.renderLists()}
         </div>
       </div>
diff --git a/ui/src/data_explorer/components/RawQueryEditor.js b/ui/src/data_explorer/components/RawQueryEditor.js
index 636a6f85ad..bb52d4b607 100644
--- a/ui/src/data_explorer/components/RawQueryEditor.js
+++ b/ui/src/data_explorer/components/RawQueryEditor.js
@@ -6,10 +6,16 @@ import {QUERY_TEMPLATES} from 'src/data_explorer/constants'
 
 const ENTER = 13
 const ESCAPE = 27
+const {
+  func,
+  shape,
+  string,
+} = PropTypes
 const RawQueryEditor = React.createClass({
   propTypes: {
-    query: PropTypes.string.isRequired,
-    onUpdate: PropTypes.func.isRequired,
+    query: string.isRequired,
+    onUpdate: func.isRequired,
+    config: shape().isRequired,
   },
 
   getInitialState() {