diff --git a/src/app/components/pb-schema/pb-schema.component.html b/src/app/components/pb-schema/pb-schema.component.html
index 05bcb3d861be16cc197dbf6dbe0b68e7f8a4950a..ccf7d13c800c759f13e472c9637d29ee4e764c84 100644
--- a/src/app/components/pb-schema/pb-schema.component.html
+++ b/src/app/components/pb-schema/pb-schema.component.html
@@ -9,11 +9,11 @@
     <div #pbSchemaContainer id="pb-schema-inner-container">
         <div id="pb-schema-toolbar">
 
-            <button type="button" id="add-basin" mat-raised-button color="accent" (click)="onAddBasinClick()">
+            <button type="button" *ngIf="enableAddItems" id="add-basin" mat-raised-button color="accent" (click)="onAddBasinClick()">
                 {{ uitextAddBasin }}
             </button>
 
-            <button type="button" id="add-wall" mat-raised-button color="accent" (click)="onAddWallClick()" [disabled]="! enableAddWallButton">
+            <button type="button" *ngIf="enableAddItems" id="add-wall" mat-raised-button color="accent" (click)="onAddWallClick()" [disabled]="! enableAddWallButton">
                 {{ uitextAddWall }}
             </button>
 
diff --git a/src/app/components/pb-schema/pb-schema.component.ts b/src/app/components/pb-schema/pb-schema.component.ts
index 050cd5bbfee2d278865d3350aaaff3c16f186862..0da9aee8c0e03f496c12ac25b1883564b8890952 100644
--- a/src/app/components/pb-schema/pb-schema.component.ts
+++ b/src/app/components/pb-schema/pb-schema.component.ts
@@ -370,6 +370,10 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
         this.model = this.pbSchema.pb;
     }
 
+    public get enableAddItems(): boolean {
+        return this.calculatorComponent.showPBInputData;
+    }
+
     public get enableRemoveButton() {
         if (this._selectedItem === undefined) {
             return false;