diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 5203dbfa46..90d37c5574 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -181,6 +181,7 @@
         "title": "DSpace Angular :: Metadata Schema Registry",
         "head": "Metadata Schema",
         "description": "This is the metadata schema for \"{{namespace}}\".",
+        "return": "Return",
         "form": {
           "create": "Create metadata field",
           "edit": "Edit metadata field",
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index d956af2043..a254f20428 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -48,12 +48,12 @@
 
             </ds-pagination>
 
-            <button type="submit" class="btn btn-primary" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}
-            </button>
+            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+              {{'admin.registries.metadata.schemas.no-items' | translate}}
+            </div>
 
-            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info"
-                 role="alert">
-                {{'admin.registries.metadata.schemas.no-items' | translate}}
+            <div>
+              <button *ngIf="(metadataSchemas | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
             </div>
 
         </div>
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 89db4970b6..88c807e3bc 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -34,7 +34,7 @@ export class MetadataRegistryComponent {
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadataschemas-pagination',
-    pageSize: 2
+    pageSize: 25
   });
 
   constructor(private registryService: RegistryService,
@@ -143,6 +143,7 @@ export class MetadataRegistryComponent {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataSchema();
+          this.registryService.cancelEditMetadataSchema();
           this.forceUpdateSchemas();
         });
       }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index d42847a5e7..23a5765058 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
@@ -20,7 +20,7 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 /**
  * A form used for creating and editing metadata schemas
  */
-export class MetadataSchemaFormComponent implements OnInit {
+export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
 
   /**
    * A unique id used for ds-form
@@ -147,7 +147,25 @@ export class MetadataSchemaFormComponent implements OnInit {
             this.submitForm.emit(updatedSchema);
           });
         }
+        this.clearFields();
       }
     );
   }
+
+  /**
+   * Reset all input-fields to be empty
+   */
+  clearFields() {
+    this.formGroup.patchValue({
+      prefix: '',
+      namespace: ''
+    });
+  }
+
+  /**
+   * Cancel the current edit when component is destroyed
+   */
+  ngOnDestroy(): void {
+    this.onCancel();
+  }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index ad50e6cd11..509af6609b 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 import {
   DynamicFormControlModel,
@@ -22,7 +22,7 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 /**
  * A form used for creating and editing metadata fields
  */
-export class MetadataFieldFormComponent implements OnInit {
+export class MetadataFieldFormComponent implements OnInit, OnDestroy {
 
   /**
    * A unique id used for ds-form
@@ -175,7 +175,26 @@ export class MetadataFieldFormComponent implements OnInit {
             this.submitForm.emit(updatedField);
           });
         }
+        this.clearFields();
       }
     );
   }
+
+  /**
+   * Reset all input-fields to be empty
+   */
+  clearFields() {
+    this.formGroup.patchValue({
+      element: '',
+      qualifier: '',
+      scopeNote: ''
+    });
+  }
+
+  /**
+   * Cancel the current edit when component is destroyed
+   */
+  ngOnDestroy(): void {
+    this.onCancel();
+  }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index 50b139ff31..4a7a4cf34d 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -47,13 +47,15 @@
         </div>
       </ds-pagination>
 
-      <button type="submit" class="btn btn-primary" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}
-      </button>
-
-      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
+      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
         {{'admin.registries.schema.fields.no-items' | translate}}
       </div>
 
+      <div>
+        <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+        <button *ngIf="(metadataFields | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+      </div>
+
     </div>
   </div>
 </div>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index f577832a63..bdc7d5ed27 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -175,6 +175,7 @@ export class MetadataSchemaComponent implements OnInit {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataField();
+          this.registryService.cancelEditMetadataField();
           this.forceUpdateFields();
         });
       }