diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 0c3f23e29c61..4803410fe9cd 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -332,7 +332,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
danger
/>
{shouldUseNarrowLayout && {getHeaderButtons()}}
- {(!shouldUseNarrowLayout || categoryList.length === 0 || isLoading) && getHeaderText()}
+ {(!shouldUseNarrowLayout || !hasVisibleCategories || isLoading) && getHeaderText()}
{isLoading && (
reportField.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline);
+
useFocusEffect(fetchReportFields);
useEffect(() => {
@@ -272,7 +274,7 @@ function WorkspaceReportFieldsPage({
cancelText={translate('common.cancel')}
danger
/>
- {(!shouldUseNarrowLayout || reportFieldsSections[0].data.length === 0 || isLoading) && getHeaderText()}
+ {(!shouldUseNarrowLayout || !hasVisibleReportField || isLoading) && getHeaderText()}
{isLoading && (
- {(!shouldUseNarrowLayout || tagList.length === 0 || isLoading) && getHeaderText()}
+ {(!shouldUseNarrowLayout || !hasVisibleTag || isLoading) && getHeaderText()}
{isLoading && (