diff --git a/src/App.vue b/src/App.vue
index 0c3e15e..4f02320 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -78,7 +78,7 @@
           >
             <ServiceGroup
               v-for="(group, groupIndex) in services"
-              :key="groupIndex"
+              :key="`${currentPage}-${groupIndex}`"
               :group="group"
               :is-vertical="vlayout && !filter"
               :proxy="config.proxy"
@@ -187,6 +187,7 @@ export default {
       document.title =
         this.config.documentTitle ||
         [this.config.title, this.config.subtitle].filter(Boolean).join(" | ");
+
       if (this.config.stylesheet) {
         let stylesheet = "";
         let addtionnal_styles = this.config.stylesheet;
diff --git a/src/components/ServiceGroup.vue b/src/components/ServiceGroup.vue
index 4e40183..84e8532 100644
--- a/src/components/ServiceGroup.vue
+++ b/src/components/ServiceGroup.vue
@@ -4,7 +4,7 @@
     <GroupHeader v-if="group.name" :group="group" class="group-title" />
     <Service
       v-for="(item, index) in group.items"
-      :key="index"
+      :key="`srv-${index}`"
       :item="item"
       :proxy="proxy"
       :class="item.class || group.class"
@@ -21,7 +21,7 @@
     />
     <Service
       v-for="(item, index) in group.items"
-      :key="`service-${groupIndex}-${index}`"
+      :key="`srv-${index}`"
       :item="item"
       :proxy="proxy"
       :class="[