From de6026d908e91c9e36fa8a60c7bbdfb9f74a24ef Mon Sep 17 00:00:00 2001
From: Shao-Yen Cheng <shao-yen.cheng@hds.com>
Date: Thu, 3 Aug 2017 16:44:02 -0700
Subject: [PATCH] #3137 add the leftover code from #3138 for fixing issue #3137

---
 .../javascripts/explore/components/ControlPanelsContainer.jsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
index 8a2e52819d710..e3b29855a8075 100644
--- a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
+++ b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
@@ -74,6 +74,7 @@ class ControlPanelsContainer extends React.Component {
                   key={`controlsetrow-${i}`}
                   controls={controlSets.map(controlName => (
                     controlName &&
+                    this.props.controls[controlName] &&
                       <Control
                         name={controlName}
                         key={`control-${controlName}`}