diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 1b4e9d2cd3..cfe50def98 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -15,7 +15,8 @@
             class="ds-form-input-btn  btn btn-outline-primary"
             id="scrollableDropdownMenuButton_{{model.id}}"
             ngbDropdownToggle
-            [disabled]="model.readOnly"></button>
+            [disabled]="model.readOnly"
+            (click)="onToggle(sdRef); $event.stopPropagation();"></button>
 
   <div ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 0b1a81ccb4..e51fc78ec3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -118,6 +118,14 @@ export class DsDynamicScrollableDropdownComponent extends DynamicFormControlComp
     this.setCurrentValue(event);
   }
 
+  onToggle(sdRef: NgbDropdown) {
+    if (sdRef.isOpen()) {
+      this.focus.emit(event);
+    } else {
+      this.blur.emit(event);
+    }
+  }
+
   setCurrentValue(value): void {
     let result: string;
     if (isUndefined(value) || isNull(value)) {
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 014471155a..c097374038 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -138,20 +138,22 @@ export class FormSectionComponent extends SectionModelComponent {
 
   updateForm(sectionData: WorkspaceitemSectionDataType, errors: SubmissionSectionError[]) {
 
-    if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data) && this.hasMetadataEnrichment(sectionData)) {
-      this.translate.get('submission.sections.general.metadata-extracted', {sectionId: this.sectionData.id})
-        .pipe(take(1))
-        .subscribe((m) => {
-          this.notificationsService.info(null, m, null, true);
-        });
-      this.isUpdating = true;
-      this.formModel = null;
-      this.cdr.detectChanges();
-      this.initForm(sectionData);
-      this.checksForErrors(errors);
+    if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
       this.sectionData.data = sectionData;
-      this.isUpdating = false;
-      this.cdr.detectChanges();
+      if (this.hasMetadataEnrichment(sectionData)) {
+        this.translate.get('submission.sections.general.metadata-extracted', { sectionId: this.sectionData.id })
+          .pipe(take(1))
+          .subscribe((m) => {
+            this.notificationsService.info(null, m, null, true);
+          });
+        this.isUpdating = true;
+        this.formModel = null;
+        this.cdr.detectChanges();
+        this.initForm(sectionData);
+        this.checksForErrors(errors);
+        this.isUpdating = false;
+        this.cdr.detectChanges();
+      }
     } else if (isNotEmpty(errors) || isNotEmpty(this.sectionData.errors)) {
       this.checksForErrors(errors);
     }