From 223d46f49739f7918dc993b4dc037134562445a0 Mon Sep 17 00:00:00 2001
From: deniz kusefoglu <denizk@gmail.com>
Date: Mon, 18 Sep 2017 14:11:52 -0700
Subject: [PATCH 1/2] Display Query Templates dropdown even when status is null

---
 ui/src/shared/components/QueryStatus.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/shared/components/QueryStatus.js b/ui/src/shared/components/QueryStatus.js
index 951fa65ba..9fa329a38 100644
--- a/ui/src/shared/components/QueryStatus.js
+++ b/ui/src/shared/components/QueryStatus.js
@@ -4,7 +4,11 @@ import classnames from 'classnames'
 
 const QueryStatus = ({status, children}) => {
   if (!status) {
-    return <div className="query-editor--status" />
+    return (
+      <div className="query-editor--status">
+        {children}
+      </div>
+    )
   }
 
   if (status.loading) {

From f06d3f6b139e9d6fb6105b222671173892621821 Mon Sep 17 00:00:00 2001
From: deniz kusefoglu <denizk@gmail.com>
Date: Mon, 18 Sep 2017 14:30:01 -0700
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d2e1e50f..156c4a441 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## v1.3.9.0 [unreleased]
 ### Bug Fixes
+1.[#2004](https://github.com/influxdata/chronograf/pull/2004): Fix DE query templates dropdown disappearance.
 ### Features
 1. [#1885](https://github.com/influxdata/chronograf/pull/1885): Add `fill` options to data explorer and dashboard queries
 1. [#1978](https://github.com/influxdata/chronograf/pull/1978): Support editing kapacitor TICKScript