diff --git a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
index 385dbfc39..31a56fda3 100644
--- a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
@@ -95,7 +95,7 @@ function WidgetWrapper(props: Props) {
{isPredefined ? 'Cannot drill down system provided metrics' : 'Click to drill down'}
diff --git a/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx b/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx
index b59aae664..c5b88c388 100644
--- a/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx
+++ b/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx
@@ -8,6 +8,7 @@ import { filtersMap } from 'Types/filter/newFilter';
export const getMatchingEntries = (searchQuery: string, filters: Record) => {
const matchingCategories: string[] = [];
const matchingFilters: Record = {};
+
if (searchQuery.length === 0) return {
matchingCategories: Object.keys(filters),
matchingFilters: filters,