diff --git a/app/javascript/vue/shared/dropdown_selector.vue b/app/javascript/vue/shared/dropdown_selector.vue
index 7e9e359dd..9c9667bc1 100644
--- a/app/javascript/vue/shared/dropdown_selector.vue
+++ b/app/javascript/vue/shared/dropdown_selector.vue
@@ -7,8 +7,22 @@
             :data-select-multiple-name="dataSelectMultipleName"
             :data-placeholder="placeholder"
     >
-      <optgroup v-if="groupSelector" v-for="group in this.options" :label="group.label">
-        <option v-for="option in group.options"
+      <template v-if="groupSelector">
+        <optgroup v-for="group in this.options" :label="group.label" :key="group.label">
+          <option v-for="option in group.options"
+            :key="option.label"
+            :value="option.value"
+            :selected="option.value == selectedValue || (Array.isArray(selectedValue) && selectedValue.some(e => e == option.value))"
+            :data-selected="option.value == selectedValue || (Array.isArray(selectedValue) && selectedValue.some(e => e == option.value))"
+            :data-params="JSON.stringify(option.params)"
+            :data-group="group.label">
+            {{ option.label }}
+          </option>
+        </optgroup>
+      </template>
+      <template v-else>
+        <option
+          v-for="option in this.options"
           :key="option.label"
           :value="option.value"
           :selected="option.value == selectedValue || (Array.isArray(selectedValue) && selectedValue.some(e => e == option.value))"
@@ -16,16 +30,7 @@
           :data-params="JSON.stringify(option.params)">
           {{ option.label }}
         </option>
-      </optgroup>
-      <option v-if="!groupSelector"
-        v-for="option in this.options"
-        :key="option.label"
-        :value="option.value"
-        :selected="option.value == selectedValue || (Array.isArray(selectedValue) && selectedValue.some(e => e == option.value))"
-        :data-selected="option.value == selectedValue || (Array.isArray(selectedValue) && selectedValue.some(e => e == option.value))"
-        :data-params="JSON.stringify(option.params)">
-          {{ option.label }}
-      </option>
+      </template>
     </select>
   </div>
 </template>