diff --git a/frontend/src/metabase/questions/containers/EntityList.jsx b/frontend/src/metabase/questions/containers/EntityList.jsx
index 4d3bd0f9f5a61ea1c61b7351a6d90b177fd1858f..8ef765765c94b19222b1c904e54ceb5682bb4fc2 100644
--- a/frontend/src/metabase/questions/containers/EntityList.jsx
+++ b/frontend/src/metabase/questions/containers/EntityList.jsx
@@ -175,7 +175,7 @@ export default class EntityList extends Component {
 
         const section = this.getSection();
 
-        const hasEntitiesInPlainState = !(section.section === "all" && entityIds.length === 0);
+        const hasEntitiesInPlainState = entityIds.length > 0 || section.section !== "all";
 
         const showActionHeader = (editable && selectedCount > 0);
         const showSearchHeader = (hasEntitiesInPlainState && showSearchWidget);