diff --git a/src/components/DocumentPage/EditAnnotation.vue b/src/components/DocumentPage/EditAnnotation.vue
index d06ccc9e..8335a7b1 100644
--- a/src/components/DocumentPage/EditAnnotation.vue
+++ b/src/components/DocumentPage/EditAnnotation.vue
@@ -24,7 +24,9 @@
               ? `${selectedSet.label_set.name} ${
                   selectedSet.id
                     ? numberOfAnnotationSetGroup(selectedSet)
-                    : `(${$t("new")})`
+                    : `${numberOfLabelSetGroup(selectedSet.label_set)} (${$t(
+                        "new"
+                      )})`
                 }`
               : $t("select_annotation_set")
           }}
@@ -33,6 +35,14 @@
           </span>
         </b-button>
       </template>
+      <b-button
+        type="is-ghost"
+        :class="['add-ann-set', 'dropdown-item', 'no-icon-margin']"
+        icon-left="plus"
+        @click="openAnnotationSetCreation"
+      >
+        {{ $t("new_ann_set_title") }}
+      </b-button>
       <b-dropdown-item
         v-for="(set, index) in setsList"
         :key="`${set.label_set.id}_${index}`"
@@ -41,23 +51,12 @@
       >
         <span>{{
           `${set.label_set.name} ${
-            set.id ? numberOfAnnotationSetGroup(set) : `(${$t("new")})`
+            set.id
+              ? numberOfAnnotationSetGroup(set)
+              : `${numberOfLabelSetGroup(set.label_set)} (${$t("new")})`
           }`
         }}</span>
       </b-dropdown-item>
-      <b-button
-        type="is-ghost"
-        :class="[
-          'add-ann-set',
-          'dropdown-item',
-          'no-icon-margin',
-          setsList.length > 0 ? 'has-border' : '',
-        ]"
-        icon-left="plus"
-        @click="openAnnotationSetCreation"
-      >
-        {{ $t("new_ann_set_title") }}
-      </b-button>
     </b-dropdown>
     <b-tooltip
       multilined
@@ -166,6 +165,7 @@ export default {
     ]),
     ...mapGetters("document", [
       "numberOfAnnotationSetGroup",
+      "numberOfLabelSetGroup",
       "labelsFilteredForAnnotationCreation",
     ]),
     ...mapGetters("display", ["bboxToRect"]),
@@ -304,12 +304,21 @@ export default {
       }
     },
     chooseLabelSet(labelSet) {
+      // check if there's already a new entry for that label set to be created
+      const existsIndex = this.setsList.findIndex((set) => {
+        return set.id === null && set.label_set.id === labelSet.id;
+      });
+
       const newSet = {
         label_set: labelSet,
         labels: labelSet.labels,
         id: null,
       };
-      this.setsList.push(newSet);
+      if (existsIndex >= 0) {
+        this.setsList[existsIndex] = newSet;
+      } else {
+        this.setsList.unshift(newSet);
+      }
       this.selectedSet = newSet;
     },
     openAnnotationSetCreation() {
diff --git a/src/components/DocumentPage/NewAnnotation.vue b/src/components/DocumentPage/NewAnnotation.vue
index 50323654..c87b570e 100644
--- a/src/components/DocumentPage/NewAnnotation.vue
+++ b/src/components/DocumentPage/NewAnnotation.vue
@@ -323,7 +323,7 @@ export default {
       if (existsIndex >= 0) {
         this.setsList[existsIndex] = newSet;
       } else {
-        this.setsList.push(newSet);
+        this.setsList.unshift(newSet);
       }
       this.selectedSet = newSet;
     },
diff --git a/src/store/document.js b/src/store/document.js
index 6cac27a2..ae922947 100644
--- a/src/store/document.js
+++ b/src/store/document.js
@@ -558,9 +558,13 @@ const getters = {
     let returnLabelSets = [];
     if (state.annotationSets) {
       state.annotationSets.forEach((annotationSet) => {
+        // last validation checks if the label set is already present in list
         if (
-          annotationSet.id == null ||
-          annotationSet.label_set.has_multiple_annotation_sets
+          (annotationSet.id == null ||
+            annotationSet.label_set.has_multiple_annotation_sets) &&
+          !returnLabelSets.find(
+            (set) => set.id !== null && set.id === annotationSet.label_set.id
+          )
         ) {
           const labelSet = { ...annotationSet.label_set };
           labelSet.labels = [...annotationSet.labels];