diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
index 6d9116bd9..f5cefc153 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
@@ -9,7 +9,7 @@
 								<div class="title">{{'PLAN-EDITOR.TITLE-EDIT' | translate}}</div>
 								<div class="subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="changes">({{'PLAN-EDITOR.UNSAVED-CHANGES' | translate}})</span></div>
 							</div>
-							<div class="ml-auto d-flex flex-row">
+							<div *ngIf="step > 0" class="ml-auto d-flex flex-row">
 
 								<div *ngIf="formGroup.get('id').value" class="col-auto d-flex align-items-center">
 									<button [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="plan-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'PLAN-EDITOR.ACTIONS.EXPORT.CAN-NOT-EXPORT' | translate">
@@ -105,7 +105,7 @@
 						</div>
 						<div class="row">
 							<div class="col-5">
-								<button mat-button class="action-btn" [disabled]="!(formGroup.get('blueprint').value && formGroup.get('label').value && formGroup.get('description').value)" (click)="selectBlueprint()">{{'PLAN-EDITOR.STEPPER.NEXT' | translate}}</button>
+								<button mat-button class="action-btn" [disabled]="!(formGroup.get('blueprint').value && formGroup.get('label').value)" (click)="selectBlueprint()">{{'PLAN-EDITOR.STEPPER.NEXT' | translate}}</button>
 							</div>
 							<div class="col-7" *ngIf="formGroup.get('blueprint').value == null || (formGroup.get('blueprint').value && formGroup.get('blueprint').value.id !== defaultBlueprintId)">
 								<div class="row">
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
index b2768f462..0c09614fa 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
@@ -80,6 +80,11 @@
     overflow-y: auto;
 }
 
+.stepper-options {
+	height: calc(100vh - 650px);
+    overflow-y: auto;
+}
+
 .stepper-title {
     text-align: left;
     font-weight: 300;