diff --git a/frontend/src/app/features/content/shared/forms/component.component.html b/frontend/src/app/features/content/shared/forms/component.component.html
index b1e7e6760..9030286b8 100644
--- a/frontend/src/app/features/content/shared/forms/component.component.html
+++ b/frontend/src/app/features/content/shared/forms/component.component.html
@@ -19,7 +19,7 @@
     
     <ng-template #noSchema>
         <ng-container *ngIf="schemasList.length > 1">
-            <button type="button" class="btn btn-outline-success dropdown-toggle" (click)="schemasDropdown.show()" #buttonSelect>
+            <button type="button" class="btn btn-outline-success dropdown-toggle" [disabled]="isDisabled | async" (click)="schemasDropdown.show()" #buttonSelect>
                 {{ 'contents.addComponent' | sqxTranslate}}
             </button>
             
@@ -32,7 +32,7 @@
             </ng-container>
         </ng-container>
         <ng-container *ngIf="schemasList.length === 1">
-            <button type="button" class="btn btn-outline-success" (click)="setSchema(schemasList[0])">
+            <button type="button" class="btn btn-outline-success" [disabled]="isDisabled | async" (click)="setSchema(schemasList[0])">
                 {{ 'contents.addComponent' | sqxTranslate}}
             </button>
         </ng-container>
diff --git a/frontend/src/app/features/content/shared/forms/component.component.ts b/frontend/src/app/features/content/shared/forms/component.component.ts
index c807937e1..27f68575d 100644
--- a/frontend/src/app/features/content/shared/forms/component.component.ts
+++ b/frontend/src/app/features/content/shared/forms/component.component.ts
@@ -6,7 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
-import { AppLanguageDto, ComponentFieldPropertiesDto, ComponentForm, EditContentForm, FieldDto, FieldSection, ModalModel, ResourceOwner, SchemaDto, Types } from '@app/shared';
+import { Observable } from 'rxjs';
+import { AppLanguageDto, ComponentFieldPropertiesDto, ComponentForm, disabled$, EditContentForm, FieldDto, FieldSection, ModalModel, ResourceOwner, SchemaDto, Types } from '@app/shared';
 import { ComponentSectionComponent } from './component-section.component';
 
 @Component({
@@ -43,6 +44,8 @@ export class ComponentComponent extends ResourceOwner implements OnChanges {
     public schemasDropdown = new ModalModel();
     public schemasList: ReadonlyArray<SchemaDto> = [];
 
+    public isDisabled?: Observable<boolean>;
+
     constructor(
         private readonly changeDetector: ChangeDetectorRef,
     ) {
@@ -52,6 +55,8 @@ export class ComponentComponent extends ResourceOwner implements OnChanges {
     public ngOnChanges(changes: SimpleChanges) {
         if (changes['formModel']) {
             this.unsubscribeAll();
+            
+            this.isDisabled = disabled$(this.formModel.form);
 
             this.own(
                 this.formModel.form.valueChanges