diff --git a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx index 71e2bc1032871..8fe18db77f902 100644 --- a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx +++ b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx @@ -92,8 +92,13 @@ class ControlPanelsContainer extends React.Component { const displaySectionsToRender = []; allSectionsToRender.forEach((section) => { if (section.controlSetRows.some(rows => rows.some( - control => controls[control] && !controls[control].renderTrigger, - ))) { + control => ( + controls[control] && + ( + !controls[control].renderTrigger || + controls[control].tabOverride === 'data' + ) + )))) { querySectionsToRender.push(section); } else { displaySectionsToRender.push(section); diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx index ec4522be884fb..641aaaed9aae8 100644 --- a/superset/assets/javascripts/explore/stores/controls.jsx +++ b/superset/assets/javascripts/explore/stores/controls.jsx @@ -1702,6 +1702,7 @@ export const controls = { default: [], description: 'Annotation Layers', renderTrigger: true, + tabOverride: 'data', }, having_filters: {