diff --git a/src/components/AddProductFiltersModal.vue b/src/components/AddProductFiltersModal.vue
index e3ed9475..72ef8ead 100644
--- a/src/components/AddProductFiltersModal.vue
+++ b/src/components/AddProductFiltersModal.vue
@@ -14,7 +14,7 @@
     </ion-toolbar>
   </ion-header>
 
-  <ion-content>
+  <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()">
     <ion-searchbar :placeholder="translate('Search', { label })" v-model="queryString" @keyup.enter="search()"/>
     <ion-row>
       <ion-chip v-for="filter in selectedValues" outline :key="filter.id">
@@ -22,8 +22,14 @@
       </ion-chip>
     </ion-row>
 
-    <ion-list v-if="facetOptions.length">
-      <ion-item v-for="option in facetOptions" :key="option.id"  @click="!isAlreadyApplied(option.id) ? updateSelectedValues(option.id) : null">
+    <div class="empty-state" v-if="isLoading">
+      <ion-item lines="none">
+        <ion-spinner name="crescent" slot="start" />
+        {{ translate("Fetching filters") }}
+      </ion-item>
+    </div>
+    <ion-list v-else-if="filteredOptions.length">
+      <ion-item v-for="option in filteredOptions" :key="option.id"  @click="!isAlreadyApplied(option.id) ? updateSelectedValues(option.id) : null">
         <ion-label v-if="isAlreadyApplied(option.id)">{{ option.label }}</ion-label>
         <ion-checkbox v-if="!isAlreadyApplied(option.id)" :checked="selectedValues.includes(option.id)">
           {{ option.label }}
@@ -44,7 +50,7 @@
       </ion-fab-button>
     </ion-fab>
 
-    <ion-infinite-scroll @ionInfinite="loadMoreFilters($event)" threshold="100px" :disabled="!isScrollable">
+    <ion-infinite-scroll @ionInfinite="loadMoreFilters($event)" threshold="100px" v-show="isScrollable" ref="infiniteScrollRef">
       <ion-infinite-scroll-content loading-spinner="crescent" :loading-text="translate('Loading')"/>
     </ion-infinite-scroll>
   </ion-content>
@@ -70,28 +76,43 @@ import {
   IonNote,
   IonRow,
   IonSearchbar,
+  IonSpinner,
   IonTitle,
   IonToolbar,
   modalController
 } from "@ionic/vue";
 import { closeOutline, saveOutline } from 'ionicons/icons';
 import { useStore } from "vuex";
-import { UtilService } from "@/services/UtilService";
 import { translate } from '@hotwax/dxp-components';
-import { hasError } from "@/utils";
 
-const queryString = ref('');
 const facetOptions = ref([]) as any;
-const isScrollable = ref(true);
+const queryString = ref('');
 const selectedValues = ref([]) as any;
+const filteredOptions = ref([]) as any;
+const availableOptions = ref([]) as any;
+const pageSize = process.env.VUE_APP_VIEW_SIZE || 0;
+const currentPage = ref(0);
+
+const isScrollable = ref(true);
+const isLoading = ref(false);
+const isScrollingEnabled = ref(false);
+const contentRef = ref({}) as any;
+const infiniteScrollRef = ref({}) as any;
 
 const props = defineProps(["label", "facetToSelect", "searchfield", "type"]);
 const store = useStore();
 
 const appliedFilters = computed(() => store.getters["util/getAppliedFilters"]);
+const getFacetOptions = computed(() => store.getters["util/getFacetOptions"]);
 
-onMounted(() => {
+onMounted(async() => {
+  isLoading.value = true;
+  await store.dispatch("util/fetchProductFilters", { facetToSelect: props.facetToSelect, searchfield: props.searchfield })
+  facetOptions.value = getFacetOptions.value(props.searchfield);
+  availableOptions.value = JSON.parse(JSON.stringify(facetOptions.value))
+  getFilters();
   selectedValues.value = JSON.parse(JSON.stringify(appliedFilters.value[props.type][props.searchfield]))
+  isLoading.value = false;
 })
 
 function closeModal() {
@@ -99,47 +120,39 @@ function closeModal() {
 }
 
 function search() {
-  getFilters();
-}
-
-async function getFilters(vSize?: any, vIndex?: any) {
-  const viewSize = vSize ? vSize : process.env.VUE_APP_VIEW_SIZE;
-  const viewIndex = vIndex ? vIndex : 0;
-  
-  const payload = {
-    facetToSelect: props.facetToSelect,
-    docType: 'PRODUCT',
-    coreName: 'enterpriseSearch',
-    searchfield: props.searchfield,
-    jsonQuery: '{"query":"*:*","filter":["docType:PRODUCT"]}',
-    noConditionFind: 'N',
-    limit: viewSize,
-    q: queryString.value,
-    term: queryString.value,
-    offset: viewSize * viewIndex,
-  }
-
-  const resp = await UtilService.fetchFacets(payload);
-  if(!hasError(resp)) {
-    const results = resp.data.facetResponse.response
-    facetOptions.value = viewIndex === 0 ? results : [...facetOptions.value , ...results];
-    isScrollable.value = (facetOptions.value.length % process.env.VUE_APP_VIEW_SIZE) === 0;
+  isScrollable.value = true;
+  currentPage.value = 0;
+  filteredOptions.value = []
 
+  if(queryString.value.trim()) {
+    availableOptions.value = facetOptions.value.filter((option: any) => option.label.toLowerCase().includes(queryString.value.trim().toLowerCase()))
   } else {
-    facetOptions.value = [];
-    isScrollable.value = false;
+    availableOptions.value = JSON.parse(JSON.stringify(facetOptions.value))
   }
+  getFilters();
 }
 
 async function loadMoreFilters(event: any){
-  getFilters(
-    undefined,
-    Math.ceil(facetOptions.value.length / process.env.VUE_APP_VIEW_SIZE).toString() 
-  ).then(() => {
+  // Added this check here as if added on infinite-scroll component the Loading content does not gets displayed
+  if(!(isScrollingEnabled.value && isScrollable.value)) {
+    await event.target.complete();
+  }
+
+  getFilters().then(() => {
     event.target.complete();
   })
 }
 
+async function getFilters() {
+  const nextPageItems = availableOptions.value.slice(currentPage.value * pageSize, (currentPage.value + 1) * pageSize);
+  filteredOptions.value = filteredOptions.value.concat(nextPageItems);
+  currentPage.value += 1;
+
+  if(filteredOptions.value.length >= availableOptions.value.length) {
+    isScrollable.value = false;
+  }
+}
+
 function updateSelectedValues(value: string) {
   selectedValues.value.includes(value) ? selectedValues.value.splice(selectedValues.value.indexOf(value), 1) : selectedValues.value.push(value);
 }
@@ -156,6 +169,18 @@ async function saveFilters() {
   await store.dispatch('util/updateAppliedFilters', selectedFilters)
   modalController.dismiss()
 }
+
+function enableScrolling() {
+  const parentElement = contentRef.value.$el
+  const scrollEl = parentElement.shadowRoot.querySelector("div[part='scroll']")
+  let scrollHeight = scrollEl.scrollHeight, infiniteHeight = infiniteScrollRef.value.$el.offsetHeight, scrollTop = scrollEl.scrollTop, threshold = 100, height = scrollEl.offsetHeight
+  const distanceFromInfinite = scrollHeight - infiniteHeight - scrollTop - threshold - height
+  if(distanceFromInfinite < 0) {
+    isScrollingEnabled.value = false;
+  } else {
+    isScrollingEnabled.value = true;
+  }
+}
 </script>
 
 <style scoped>
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 1716b899..daf1014a 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -6,4 +6,5 @@ export default interface UtilState {
   selectedSegment: any;
   pickupGroups: any;
   pickupGroupFacilities: any;
+  facetOptions: any;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index 069746ea..9812b7d3 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -178,6 +178,34 @@ const actions: ActionTree<UtilState, RootState> = {
     return pickupGroupFacilities;
   },
 
+  async fetchProductFilters({ commit, state }, params) {
+    const filters = JSON.parse(JSON.stringify(state.facetOptions));
+
+    if(filters[params.searchfield]) return;
+
+    const payload = {
+      facetToSelect: params.facetToSelect,
+      docType: 'PRODUCT',
+      coreName: 'enterpriseSearch',
+      jsonQuery: '{"query":"*:*","filter":["docType:PRODUCT"]}',
+      noConditionFind: 'N',
+      limit: -1,
+      term: "",
+    }
+
+    try {
+      const resp = await UtilService.fetchFacets(payload);
+      if(!hasError(resp)) {
+        filters[params.searchfield] = resp.data.facetResponse.response
+      } else {
+        throw resp.data;
+      }
+    } catch(error: any) {
+      logger.error(error);
+    }
+    commit(types.UTIL_FACET_OPTIONS_UPDATED, filters);
+  },
+
   async updatePickupGroupFacilities({ commit }, payload) {
     commit(types.UTIL_PICKUP_GROUP_FACILITIES , payload);
   },
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index 9ec8c000..45a703d1 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,6 +27,9 @@ const getters: GetterTree<UtilState, RootState> = {
   getPickupGroupFacilities(state) {
     return state.pickupGroupFacilities
   },
+  getFacetOptions: (state) => (searchField: any) => {
+    return state.facetOptions[searchField].length ? state.facetOptions[searchField] : [];
+  },
 }
 
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index c88207ec..89ce4a42 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -26,7 +26,8 @@ const utilModule: Module<UtilState, RootState> = {
     },
     selectedSegment: "",
     pickupGroups: [],
-    pickupGroupFacilities: {}
+    pickupGroupFacilities: {},
+    facetOptions: {}
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index a4a05217..b00c5ff1 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -7,4 +7,5 @@ export const UTIL_FACILITY_GROUPS_UPDATED = SN_UTIL + '/FACILITY_GROUPS_UPDATED'
 export const UTIL_FACILITY_LIST_UPDATED = SN_UTIL + '/FACILITY_LIST_UPDATED'
 export const UTIL_SELECTED_SEGMENT_UPDATED = SN_UTIL + '/SELECTED_SEGMENT_UPDATED'
 export const UTIL_PICKUP_GROUPS_UPDATED = SN_UTIL + '/PICKUP_GROUPS_UPDATED'
-export const UTIL_PICKUP_GROUP_FACILITIES = SN_UTIL + '/PICKUP_GROUP_FACILITIES_UPDATED'
\ No newline at end of file
+export const UTIL_PICKUP_GROUP_FACILITIES = SN_UTIL + '/PICKUP_GROUP_FACILITIES_UPDATED'
+export const UTIL_FACET_OPTIONS_UPDATED = SN_UTIL + '/FACET_OPTIONS_UPDATED'
\ No newline at end of file
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 1e645f4b..c4998a12 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -23,7 +23,8 @@ const mutations: MutationTree <UtilState> = {
         tags: [],
         productFeatures: []
       }
-    }
+    },
+    state.facetOptions = {}
   },
   [types.UTIL_APPLIED_FILTERS_CLEARED](state) {
     state.appliedFilters = {
@@ -50,5 +51,8 @@ const mutations: MutationTree <UtilState> = {
   [types.UTIL_PICKUP_GROUP_FACILITIES](state, payload) {
     state.pickupGroupFacilities = payload
   },
+  [types.UTIL_FACET_OPTIONS_UPDATED](state, payload) {
+    state.facetOptions = payload
+  },
 }
 export default mutations;
\ No newline at end of file