diff --git a/frontend/src/metabase/questions/containers/EntityList.jsx b/frontend/src/metabase/questions/containers/EntityList.jsx
index b06cc645fec8a4b0926a0e50f3543ea828433655..95227f8e7f69a60262b88891d4f2af13963dd58d 100644
--- a/frontend/src/metabase/questions/containers/EntityList.jsx
+++ b/frontend/src/metabase/questions/containers/EntityList.jsx
@@ -176,8 +176,10 @@ export default class EntityList extends Component {
 
         const section = this.getSection();
 
+        const hasEntitiesInPlainState = entityIds.length > 0 || section.section !== "all";
+
         const showActionHeader = (editable && selectedCount > 0);
-        const showSearchHeader = (entityIds.length > 0 && showSearchWidget);
+        const showSearchHeader = (hasEntitiesInPlainState && showSearchWidget);
         const showEntityFilterWidget = onChangeSection;
         return (
             <div style={style}>
@@ -201,7 +203,7 @@ export default class EntityList extends Component {
                         :
                             null
                       }
-                      { showEntityFilterWidget && entityIds.length > 0 &&
+                      { showEntityFilterWidget && hasEntitiesInPlainState &&
                           <EntityFilterWidget
                             section={section}
                             onChange={onChangeSection}