diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html
index f6a5c339ce..c6d45c8743 100644
--- a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html
@@ -30,11 +30,16 @@
                                        (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list>
             </div>
         </div>
-        <div class="d-flex flex-row-reverse m-2">
-            <button class="btn btn-primary save"
-                    (click)="save()">
-                <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
-            </button>
+<!--        <div class="d-flex flex-row-reverse m-2">          -->
+        <div class="modal-footer">
+          <button class="btn btn-outline-secondary"
+                  (click)="close()">
+            <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
+          </button>
+          <button class="btn btn-primary save"
+                  (click)="save()">
+            <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
+          </button>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts
index 1ae2d496d2..88ffb13070 100644
--- a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts
@@ -79,13 +79,13 @@ export class SupervisionGroupSelectorComponent {
         if (rd.state === 'Success') {
           this.supervisionOrderDataService.searchByItem(this.itemUUID, null, null, followLink('group'));
           this.notificationsService.success(this.translateService.get('supervision-group-selector.notification.create.success.title', { name: this.selectedGroup.name }));
+          this.close();
         } else {
           this.notificationsService.error(
-          this.translateService.get('supervision-group-selector.notification.create.failure.title'),
-          rd.errorMessage);
+            this.translateService.get('supervision-group-selector.notification.create.failure.title'),
+            rd.statusCode == 422 ? this.translateService.get('supervision-group-selector.notification.create.already-existing') : rd.errorMessage);
         }
       });
-      this.close();
     }
   }
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 41afab0ab8..2fa72d2ac0 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -100,7 +100,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
       ).pipe(
         getAllSucceededRemoteData(),
       ).subscribe((result) => {
-        this.supervisionOrder$ = this.supervisionOrderDataService.searchByItem(this.dso.uuid, null, null, followLink('group')).pipe(
+        this.supervisionOrder$ = this.supervisionOrderDataService.searchByItem(this.dso.uuid, false, true, followLink('group')).pipe(
           getAllSucceededRemoteListPayload(),
           switchMap((supervisionOrders: SupervisionOrder[]) => {
             const supervisionOrdersArray = supervisionOrders.map((supervisionOrder: SupervisionOrder) => {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0251f171b7..47fbbaf518 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1443,6 +1443,8 @@
 
   "supervision-group-selector.select.group.label": "Select a Group",
 
+  "supervision-group-selector.button.cancel": "Cancel",
+
   "supervision-group-selector.button.save": "Save",
 
   "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
@@ -1453,6 +1455,8 @@
 
   "supervision-group-selector.notification.create.failure.title": "Error",
 
+  "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group",
+
   "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
 
   "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",