diff --git a/src/components/AddProductStoreToGroupModal.vue b/src/components/AddProductStoreToGroupModal.vue
index fc63f74f..f77b1e88 100644
--- a/src/components/AddProductStoreToGroupModal.vue
+++ b/src/components/AddProductStoreToGroupModal.vue
@@ -55,6 +55,8 @@ import logger from "@/logger";
 import { hasError } from "@/adapter";
 import { showToast } from "@/utils";
 import { DateTime } from "luxon";
+import emitter from "@/event-bus";
+
 
 export default defineComponent({
   name: "AddProductStoreToGroupModal",
@@ -96,6 +98,7 @@ export default defineComponent({
       modalController.dismiss({ dismissed: true});
     },
     async fetchGroupProductStores() {
+      emitter.emit('presentLoader')
        try {
         const resp = await FacilityService.fetchAssociatedProductStoresToGroup({
           "inputFields": {
@@ -116,6 +119,7 @@ export default defineComponent({
       } catch(err) {
         logger.error(err)
       }
+      emitter.emit('dismissLoader');
     },
     isSelected(productStoreId: any) {
       return this.selectedProductStoreValues.some((productStore: any) => productStore.productStoreId === productStoreId);
@@ -182,4 +186,9 @@ export default defineComponent({
   },
 });
 </script>
+<style scoped>
+ion-content {
+  --padding-bottom: 80px;
+}
+</style>
     
\ No newline at end of file
diff --git a/src/views/FindGroups.vue b/src/views/FindGroups.vue
index 8a0c1e62..5e5ffcb7 100644
--- a/src/views/FindGroups.vue
+++ b/src/views/FindGroups.vue
@@ -41,7 +41,7 @@
               <ion-icon :icon="bagHandleOutline" slot="start"/>
               <ion-label>{{ translate('Product stores') }}</ion-label>
               <ion-chip outline slot="end" @click="openAddProductStoreToGroupModal(group)">
-                {{ group.productStoreCount }}
+                {{ group.productStoreCount || 0 }}
               </ion-chip>
             </ion-item>
             <ion-item>