diff --git a/src/components/ProductFilterModal.vue b/src/components/ProductFilterModal.vue
index 0ccf08d5..6f110f34 100644
--- a/src/components/ProductFilterModal.vue
+++ b/src/components/ProductFilterModal.vue
@@ -13,7 +13,7 @@
     </ion-toolbar>
   </ion-header>
 
-  <ion-content>
+  <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()">
     <ion-searchbar :placeholder="$t(`Search ${label}`)" v-model="queryString" @keyup.enter="queryString = $event.target.value; search($event)"/>
 
     <ion-list>
@@ -29,7 +29,7 @@
         <ion-icon :icon="checkmarkOutline" />
       </ion-fab-button>
     </ion-fab>
-    <ion-infinite-scroll @ionInfinite="loadMoreTags($event)" threshold="100px" :disabled="!isScrollable">
+    <ion-infinite-scroll @ionInfinite="loadMoreTags($event)" threshold="100px" v-show="isScrollable" ref="infiniteScrollRef">
       <ion-infinite-scroll-content loading-spinner="crescent" :loading-text="$t('Loading')"/>
     </ion-infinite-scroll>
   </ion-content>
@@ -88,7 +88,8 @@ export default defineComponent({
       facetOptions: [] as any,
       isFilterChanged: false,
       isScrollable: true,
-      selectedValues: [] as Array<string>
+      selectedValues: [] as Array<string>,
+      isScrollingEnabled: false
     }
   },
   computed: {
@@ -100,6 +101,9 @@ export default defineComponent({
   mounted() {
     this.selectedValues = JSON.parse(JSON.stringify(this.appliedFilters[this.type][this.searchfield])).list;
   },
+  async ionViewWillEnter() {
+    this.isScrollingEnabled = false;
+  },
   methods: {
     closeModal() {
       modalController.dismiss({ dismissed: true, isFilterChanged: this.isFilterChanged });
@@ -134,13 +138,28 @@ export default defineComponent({
         this.isScrollable = false;
       }
     },
+    enableScrolling() {
+      const parentElement = (this as any).$refs.contentRef.$el
+      const scrollEl = parentElement.shadowRoot.querySelector("main[part='scroll']")
+      let scrollHeight = scrollEl.scrollHeight, infiniteHeight = (this as any).$refs.infiniteScrollRef.$el.offsetHeight, scrollTop = scrollEl.scrollTop, threshold = 100, height = scrollEl.offsetHeight
+      const distanceFromInfinite = scrollHeight - infiniteHeight - scrollTop - threshold - height
+      if(distanceFromInfinite < 0) {
+        this.isScrollingEnabled = false;
+      } else {
+        this.isScrollingEnabled = true;
+      }
+    },
     async loadMoreTags(event: any){
+       // Added this check here as if added on infinite-scroll component the Loading content does not gets displayed
+       if(!(this.isScrollingEnabled && this.isScrollable)) {
+        await event.target.complete();
+      }
       this.getTags(
         undefined,
         Math.ceil(this.facetOptions.length / process.env.VUE_APP_VIEW_SIZE).toString() 
-      ).then(() => {
-        event.target.complete();
-      })
+      ).then(async () => {
+        await event.target.complete();
+      });
     },
     updateSelectedValues(value: string) {
       this.selectedValues.includes(value) ? this.selectedValues.splice(this.selectedValues.indexOf(value), 1) : this.selectedValues.push(value);
diff --git a/src/views/SelectProduct.vue b/src/views/SelectProduct.vue
index 9089a218..7c6578d6 100644
--- a/src/views/SelectProduct.vue
+++ b/src/views/SelectProduct.vue
@@ -19,7 +19,7 @@
       </ion-toolbar>
     </ion-header>
 
-    <ion-content>
+    <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()">
       <div class="find">
 
         <aside class="filters desktop-only">
@@ -133,7 +133,16 @@
             </section>
             <hr />
           </div>
-          <ion-infinite-scroll @ionInfinite="loadMoreProducts($event)" threshold="100px" :disabled="!isScrollable">
+          <!--
+            When searching for a keyword, and if the user moves to the last item, then the didFire value inside infinite scroll becomes true and thus the infinite scroll does not trigger again on the same page(https://github.com/hotwax/users/issues/84).
+            Also if we are at the section that has been loaded by infinite-scroll and then move to the details page then the list infinite scroll does not work after coming back to the page
+            In ionic v7.6.0, an issue related to infinite scroll has been fixed that when more items can be added to the DOM, but infinite scroll does not fire as the window is not completely filled with the content(https://github.com/ionic-team/ionic-framework/issues/18071).
+            The above fix in ionic 7.6.0 is resulting in the issue of infinite scroll not being called again.
+            To fix this we have maintained another variable `isScrollingEnabled` to check whether the scrolling can be performed or not.
+            If we do not define an extra variable and just use v-show to check for `isScrollable` then when coming back to the page infinite-scroll is called programatically.
+            We have added an ionScroll event on ionContent to check whether the infiniteScroll can be enabled or not by toggling the value of isScrollingEnabled whenever the height < 0.
+          -->
+          <ion-infinite-scroll @ionInfinite="loadMoreProducts($event)" threshold="100px" v-show="isScrollable" ref="infiniteScrollRef">
             <ion-infinite-scroll-content loading-spinner="crescent" :loading-text="$t('Loading')"/>
           </ion-infinite-scroll>
         </main>
@@ -258,7 +267,8 @@ export default defineComponent({
       isFilterChanged: false,
       isServiceScheduling: false,
       job: {} as any,
-      jobId: "" as any
+      jobId: "" as any,
+      isScrollingEnabled: false
     }
   },
   methods: {
@@ -332,13 +342,28 @@ export default defineComponent({
       const viewIndex = vIndex ? vIndex : 0;
       this.store.dispatch("product/updateQuery", { viewSize, viewIndex, queryString: this.queryString })
     },
+    enableScrolling() {
+      const parentElement = (this as any).$refs.contentRef.$el
+      const scrollEl = parentElement.shadowRoot.querySelector("main[part='scroll']")
+      let scrollHeight = scrollEl.scrollHeight, infiniteHeight = (this as any).$refs.infiniteScrollRef.$el.offsetHeight, scrollTop = scrollEl.scrollTop, threshold = 100, height = scrollEl.offsetHeight
+      const distanceFromInfinite = scrollHeight - infiniteHeight - scrollTop - threshold - height
+      if(distanceFromInfinite < 0) {
+        this.isScrollingEnabled = false;
+      } else {
+        this.isScrollingEnabled = true;
+      }
+    },
     async loadMoreProducts(event: any){
+       // Added this check here as if added on infinite-scroll component the Loading content does not gets displayed
+       if(!(this.isScrollingEnabled && this.isScrollable)) {
+        await event.target.complete();
+      }
       this.getProducts(
         undefined,
         Math.ceil(this.products.list.length / process.env.VUE_APP_VIEW_SIZE).toString()
-      ).then(() => {
-        event.target.complete();
-      })
+      ).then(async () => {
+        await event.target.complete();
+      });
     },
     async updateThreshold() {
       this.isServiceScheduling = true;
@@ -518,6 +543,7 @@ export default defineComponent({
     emitter.off("productStoreChanged", this.getProducts);
   },
   async ionViewWillEnter(){
+    this.isScrollingEnabled = false;
     this.jobId = this.$route.query.id
     this.isFilterChanged = false;
     if (this.jobId) {