diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
index 86de741e7..02adda049 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
@@ -574,8 +574,13 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		if (this.step < this.maxStep) {//view is changing
 			this.step = Math.floor(this.step + 1);
 			let entry = this.visibleFieldSets[this.step - 1];
-			this.table0fContents.onToCentrySelected(entry, false);
-			this.scroll(entry);
+			const targetElement = document.getElementById(entry.id);
+			if (targetElement) {
+				this.table0fContents.onToCentrySelected(entry, false);
+				this.scroll(entry);
+			} else {
+				this.nextStep();
+			}
 		}
 	}
 
@@ -584,8 +589,13 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 			this.step = Math.ceil(this.step - 1);
 			if (this.step >= 1) {
 				let entry = this.visibleFieldSets[this.step - 1];
-				this.table0fContents.onToCentrySelected(entry, false);
-				this.scroll(entry);
+				const targetElement = document.getElementById(entry.id);
+				if (targetElement) {
+					this.table0fContents.onToCentrySelected(entry, false);
+					this.scroll(entry);
+				} else {
+					this.previousStep();
+				}
 			} else {
 				this.table0fContents.onToCentrySelected(null, false);
 				this.resetScroll();